summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-08-08 13:32:59 -0700
committerJohn Keiser <john@johnkeiser.com>2016-08-08 13:32:59 -0700
commitce1458cf8a0c0732e717ce680d84d4667d7d3c37 (patch)
tree07f1eb1ac6aa7058b133192044f9c6d1a65a7ec1 /spec/spec_helper.rb
parent7ae019e9a12cb310e45512d7091b44c849e936da (diff)
downloadchef-ce1458cf8a0c0732e717ce680d84d4667d7d3c37.tar.gz
Revert "Merge pull request #5123 from chef/lcg/resolv-replace"
This reverts commit e8877cd363642ed6757c48d1ed5ab35509d87e22, reversing changes made to 162d988d3bcfce2773ef2831fa33e416f53731f6.
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3a05e4dbeb..ba44f7c3f7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -154,8 +154,6 @@ RSpec.configure do |config|
config.filter_run_excluding :unix_only => true unless unix?
config.filter_run_excluding :aix_only => true unless aix?
config.filter_run_excluding :debian_family_only => true unless debian_family?
- config.filter_run_excluding :linux_only => true unless linux?
- config.filter_run_excluding :non_linux_only => true if linux?
config.filter_run_excluding :supports_cloexec => true unless supports_cloexec?
config.filter_run_excluding :selinux_only => true unless selinux_enabled?
config.filter_run_excluding :requires_root => true unless root?