diff options
| author | Lamont Granquist <lamont@chef.io> | 2019-07-10 15:20:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-10 15:20:04 -0700 |
| commit | a2809d49c04849386fb15961f9a716912a931d6a (patch) | |
| tree | b87749917c753823c26037547e5ca25303cb4107 | |
| parent | 742412f6eed9f288d536a8dc3509d7bc58f5dccb (diff) | |
| parent | 9685e6ec1797e9e283597fc5634f4663fdf1e698 (diff) | |
| download | chef-a2809d49c04849386fb15961f9a716912a931d6a.tar.gz | |
Merge pull request #8728 from chef/travis
Remove rspec config for Travis
| -rw-r--r-- | spec/functional/resource/ifconfig_spec.rb | 4 | ||||
| -rw-r--r-- | spec/functional/resource/mount_spec.rb | 4 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/spec/functional/resource/ifconfig_spec.rb b/spec/functional/resource/ifconfig_spec.rb index 10ebcaf8b6..3ea7054a9f 100644 --- a/spec/functional/resource/ifconfig_spec.rb +++ b/spec/functional/resource/ifconfig_spec.rb @@ -1,6 +1,6 @@ # # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>) -# Copyright:: Copyright 2013-2016, Chef Software Inc. +# Copyright:: Copyright 2013-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,7 +23,7 @@ require "chef/mixin/shell_out" # run this test only for following platforms. include_flag = !(%w{amazon debian aix}.include?(ohai[:platform_family]) || (ohai[:platform_family] == "rhel" && ohai[:platform_version].to_i < 7)) -describe Chef::Resource::Ifconfig, :requires_root, :skip_travis, external: include_flag do +describe Chef::Resource::Ifconfig, :requires_root, external: include_flag do # This test does not work in travis because there is no eth0 include Chef::Mixin::ShellOut diff --git a/spec/functional/resource/mount_spec.rb b/spec/functional/resource/mount_spec.rb index 6dd9f54412..be05d5d443 100644 --- a/spec/functional/resource/mount_spec.rb +++ b/spec/functional/resource/mount_spec.rb @@ -1,6 +1,6 @@ # # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>) -# Copyright:: Copyright 2013-2018, Chef Software Inc. +# Copyright:: Copyright 2013-2019, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,7 +24,7 @@ require "tmpdir" # run this test only for following platforms. include_flag = !(%w{debian rhel amazon aix solaris2}.include?(ohai[:platform_family])) -describe Chef::Resource::Mount, :requires_root, :skip_travis, external: include_flag do +describe Chef::Resource::Mount, :requires_root, external: include_flag do # Disabled in travis because it refuses to let us mount a ramdisk. /dev/ramX does not # exist even after loading the kernel module diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 96d02cc5d8..9b54761df5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -140,7 +140,6 @@ RSpec.configure do |config| config.filter_run_excluding skip_appveyor: true if ENV["APPVEYOR"] config.filter_run_excluding appveyor_only: true unless ENV["APPVEYOR"] - config.filter_run_excluding skip_travis: true if ENV["TRAVIS"] config.filter_run_excluding windows_only: true unless windows? config.filter_run_excluding not_supported_on_windows: true if windows? |