Permalink
Browse files

Final Travis tweaks for now.

* Disable JRuby as it still hangs. rbx-* are placeholders
* Randomize example execution order, seeded with current time
* Add 1.9.3 to the Guardfile
* rake 0.9+ works
  • Loading branch information...
1 parent 0e9cae5 commit 3ebe9aea3c59576b58a181700bea54a785e08113 @seancribbs seancribbs committed Jan 13, 2012
Showing with 11 additions and 3 deletions.
  1. +3 −1 .travis.yml
  2. +1 −1 Guardfile
  3. +5 −0 Rakefile
  4. +1 −1 riak-client.gemspec
  5. +1 −0 spec/spec_helper.rb
View
@@ -2,7 +2,9 @@ rvm:
- 1.8.7
- 1.9.2
- 1.9.3
- - jruby
+# - jruby
+# - rbx-18mode
+# - rbx-19mode
before_script:
- ! 'echo "root: .riaktest" > spec/support/test_server.yml'
- ! 'echo "source: /usr/sbin" >> spec/support/test_server.yml'
View
@@ -3,7 +3,7 @@
gemset = ENV['RVM_GEMSET'] || 'ripple'
gemset = "@#{gemset}" unless gemset.to_s == ''
-rvms = %w[ 1.8.7 1.9.2 jruby ].map do |version|
+rvms = %w[ 1.8.7 1.9.2 1.9.3 ].map do |version|
"#{version}@#{gemset}"
end
View
@@ -58,6 +58,11 @@ namespace :spec do
RSpec::Core::RakeTask.new(:all) do |spec|
spec.rspec_opts = %w[--profile --tag '~slow']
end
+
+ desc "Run Slow Specs Only"
+ RSpec::Core::RakeTask.new(:slow) do |spec|
+ spec.rspec_opts = %w[--profile --tag slow]
+ end
end
desc "Run All Specs (including slow specs)"
View
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
gem.add_development_dependency "fakeweb", ">=1.2"
gem.add_development_dependency "rack", ">=1.0"
gem.add_development_dependency "excon", "~>0.6.1"
- gem.add_development_dependency 'rake', '~> 0.8.7'
+ gem.add_development_dependency 'rake'
gem.add_runtime_dependency "i18n", ">=0.4.0"
gem.add_runtime_dependency "builder", ">= 2.1.2"
gem.add_runtime_dependency "beefcake", "~>0.3.7"
View
@@ -38,4 +38,5 @@
config.filter_run :focus => true
config.run_all_when_everything_filtered = true
+ config.seed = Time.now.utc
end

0 comments on commit 3ebe9ae

Please sign in to comment.