Merge pull request #5914 from mitchellh/sethvargo/travis_docker

Try the container VMs
This commit is contained in:
Seth Vargo 2015-07-09 17:27:50 -06:00
commit a822bb2aa6
2 changed files with 10 additions and 13 deletions

View File

@ -1,11 +1,13 @@
language: ruby language: ruby
before_install: sudo: false
- sudo apt-get update -qq
- sudo apt-get install -qq -y bsdtar cache: bundler
- rvm @global do gem uninstall bundler --all --executables
- gem uninstall bundler --all --executables addons:
- gem install bundler --version '< 1.7.0' apt:
packages:
- bsdtar
rvm: rvm:
- 2.0.0 - 2.0.0
@ -18,4 +20,4 @@ env:
global: global:
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
script: rake test:unit script: bundle exec rake test:unit

View File

@ -4,11 +4,6 @@ require 'rspec/core/rake_task'
namespace :test do namespace :test do
RSpec::Core::RakeTask.new(:unit) do |t| RSpec::Core::RakeTask.new(:unit) do |t|
t.pattern = "test/unit/**/*_test.rb" t.pattern = "test/unit/**/*_test.rb"
end t.rspec_opts = "--color"
Rake::TestTask.new do |t|
t.name = "unit_old"
t.libs << "test/unit_legacy"
t.pattern = "test/unit_legacy/**/*_test.rb"
end end
end end