chef 11.8.4.ohai7.0-x86-mingw32 → 11.10.0.alpha.1-x86-mingw32

data/spec/integration/client/client_spec.rb

@@ -22,19 +22,19 @@ EOM
     context 'and no config file' do
       it 'should complete with success when cwd is just above cookbooks and paths are not specified' do
         chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
-        result = shell_out("#{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to(''))
+        result = shell_out("ruby #{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to(''))
         result.error!
       end
 
       it 'should complete with success when cwd is below cookbooks and paths are not specified' do
         chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
-        result = shell_out("#{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to('cookbooks/x'))
+        result = shell_out("ruby #{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to('cookbooks/x'))
         result.error!
       end
 
       it 'should fail when cwd is below high above and paths are not specified' do
         chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
-        result = shell_out("#{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => File.expand_path('..', path_to('')))
+        result = shell_out("ruby #{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => File.expand_path('..', path_to('')))
         result.exitstatus.should == 1
       end
     end
@@ -44,13 +44,14 @@ EOM
 
       it 'should load .chef/knife.rb when -z is specified' do
         chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
-        result = shell_out("#{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to(''))
-        result.exitstatus.should == 2
+        result = shell_out("ruby #{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to(''))
+        # FATAL: Configuration error NoMethodError: undefined method `xxx' for nil:NilClass
+        result.stdout.should include("xxx")
       end
 
       it 'fails to load .chef/knife.rb when -z is specified and --config-file-jail does not include the .chef/knife.rb' do
         chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
-        result = shell_out("#{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('roles')}\"", :cwd => path_to(''))
+        result = shell_out("ruby #{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('roles')}\"", :cwd => path_to(''))
         result.error!
       end
     end
@@ -100,14 +101,87 @@ EOM
       it "should complete with success even with a client key" do
         file 'config/client.rb', <<EOM
 local_mode true
-client_key "#{path_to('mykey.pem')}"
-cookbook_path "#{path_to('cookbooks')}"
+client_key #{path_to('mykey.pem').inspect}
+cookbook_path #{path_to('cookbooks').inspect}
 EOM
 
         chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
         result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
         result.error!
       end
+
+      it "should run recipes specified directly on the command line" do
+        file 'config/client.rb', <<EOM
+local_mode true
+client_key #{path_to('mykey.pem').inspect}
+cookbook_path #{path_to('cookbooks').inspect}
+EOM
+
+        file 'arbitrary.rb', <<EOM
+file #{path_to('tempfile.txt').inspect} do
+  content '1'
+end
+EOM
+
+        file 'arbitrary2.rb', <<EOM
+file #{path_to('tempfile2.txt').inspect} do
+  content '2'
+end
+EOM
+
+        chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
+        result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" #{path_to('arbitrary.rb')} #{path_to('arbitrary2.rb')}", :cwd => chef_dir)
+        result.error!
+
+        IO.read(path_to('tempfile.txt')).should == '1'
+        IO.read(path_to('tempfile2.txt')).should == '2'
+      end
+
+      it "should run recipes specified as relative paths directly on the command line" do
+        file 'config/client.rb', <<EOM
+local_mode true
+client_key #{path_to('mykey.pem').inspect}
+cookbook_path #{path_to('cookbooks').inspect}
+EOM
+
+        file 'arbitrary.rb', <<EOM
+file #{path_to('tempfile.txt').inspect} do
+  content '1'
+end
+EOM
+
+        chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
+        result = shell_out("#{chef_dir}/chef-client -c \"#{path_to('config/client.rb')}\" arbitrary.rb", :cwd => path_to(''))
+        result.error!
+
+        IO.read(path_to('tempfile.txt')).should == '1'
+      end
+
+      it "should run recipes specified directly on the command line AFTER recipes in the run list" do
+        file 'config/client.rb', <<EOM
+local_mode true
+client_key #{path_to('mykey.pem').inspect}
+cookbook_path #{path_to('cookbooks').inspect}
+EOM
+
+        file 'cookbooks/x/recipes/constant_definition.rb', <<EOM
+class ::Blah
+  THECONSTANT = '1'
+end
+EOM
+        file 'arbitrary.rb', <<EOM
+file #{path_to('tempfile.txt').inspect} do
+  content ::Blah::THECONSTANT
+end
+EOM
+
+        chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
+        result = shell_out("#{chef_dir}/chef-client -c \"#{path_to('config/client.rb')}\" -o x::constant_definition arbitrary.rb", :cwd => path_to(''))
+        result.error!
+
+        IO.read(path_to('tempfile.txt')).should == '1'
+      end
+
     end
 
     it "should complete with success when passed the -z flag" do

data/spec/integration/client/ipv6_spec.rb

@@ -0,0 +1,133 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'support/shared/integration/integration_helper'
+require 'chef/mixin/shell_out'
+
+describe "chef-client" do
+  extend IntegrationSupport
+  include Chef::Mixin::ShellOut
+
+  let(:chef_zero_opts) { {:host => "::1"} }
+
+  let(:validation_pem) do
+    <<-END_VALIDATION_PEM
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEApubutqtYYQ5UiA9QhWP7UvSmsfHsAoPKEVVPdVW/e8Svwpyf
+0Xef6OFWVmBE+W442ZjLOe2y6p2nSnaq4y7dg99NFz6X+16mcKiCbj0RCiGqCvCk
+NftHhTgO9/RFvCbmKZ1RKNob1YzLrFpxBHaSh9po+DGWhApcd+I+op+ZzvDgXhNn
+0nauZu3rZmApI/r7EEAOjFedAXs7VPNXhhtZAiLSAVIrwU3ZajtSzgXOxbNzgj5O
+AAAMmThK+71qPdffAdO4J198H6/MY04qgtFo7vumzCq0UCaGZfmeI1UNE4+xQWwP
+HJ3pDAP61C6Ebx2snI2kAd9QMx9Y78nIedRHPwIDAQABAoIBAHssRtPM1GacWsom
+8zfeN6ZbI4KDlbetZz0vhnqDk9NVrpijWlcOP5dwZXVNitnB/HaqCqFvyPDY9JNB
+zI/pEFW4QH59FVDP42mVEt0keCTP/1wfiDDGh1vLqVBYl/ZphscDcNgDTzNkuxMx
+k+LFVxKnn3w7rGc59lALSkpeGvbbIDjp3LUMlUeCF8CIFyYZh9ZvXe4OCxYdyjxb
+i8tnMLKvJ4Psbh5jMapsu3rHQkfPdqzztQUz8vs0NYwP5vWge46FUyk+WNm/IhbJ
+G3YM22nwUS8Eu2bmTtADSJolATbCSkOwQ1D+Fybz/4obfYeGaCdOqB05ttubhenV
+ShsAb7ECgYEA20ecRVxw2S7qA7sqJ4NuYOg9TpfGooptYNA1IP971eB6SaGAelEL
+awYkGNuu2URmm5ElZpwJFFTDLGA7t2zB2xI1FeySPPIVPvJGSiZoFQOVlIg9WQzK
+7jTtFQ/tOMrF+bigEUJh5bP1/7HzqSpuOsPjEUb2aoCTp+tpiRGL7TUCgYEAwtns
+g3ysrSEcTzpSv7fQRJRk1lkBhatgNd0oc+ikzf74DaVLhBg1jvSThDhiDCdB59mr
+Jh41cnR1XqE8jmdQbCDRiFrI1Pq6TPaDZFcovDVE1gue9x86v3FOH2ukPG4d2/Xy
+HevXjThtpMMsWFi0JYXuzXuV5HOvLZiP8sN3lSMCgYANpdxdGM7RRbE9ADY0dWK2
+V14ReTLcxP7fyrWz0xLzEeCqmomzkz3BsIUoouu0DCTSw+rvAwExqcDoDylIVlWO
+fAifz7SeZHbcDxo+3TsXK7zwnLYsx7YNs2+aIv6hzUUbMNmNmXMcZ+IEwx+mRMTN
+lYmZdrA5mr0V83oDFPt/jQKBgC74RVE03pMlZiObFZNtheDiPKSG9Bz6wMh7NWMr
+c37MtZLkg52mEFMTlfPLe6ceV37CM8WOhqe+dwSGrYhOU06dYqUR7VOZ1Qr0aZvo
+fsNPu/Y0+u7rMkgv0fs1AXQnvz7kvKaF0YITVirfeXMafuKEtJoH7owRbur42cpV
+YCAtAoGAP1rHOc+w0RUcBK3sY7aErrih0OPh9U5bvJsrw1C0FIZhCEoDVA+fNIQL
+syHLXYFNy0OxMtH/bBAXBGNHd9gf5uOnqh0pYcbe/uRAxumC7Rl0cL509eURiA2T
++vFmf54y9YdnLXaqv+FhJT6B6V7WX7IpU9BMqJY1cJYXHuHG2KA=
+-----END RSA PRIVATE KEY-----
+END_VALIDATION_PEM
+  end
+
+  let(:cache_path) do
+    Dir.mktmpdir
+  end
+
+  let(:basic_config_file) do
+    <<-END_CLIENT_RB
+chef_server_url "http://[::1]:8889"
+validation_key '#{path_to('config/validator.pem')}'
+cache_path '#{cache_path}'
+client_key '#{cache_path}/client.pem'
+END_CLIENT_RB
+  end
+
+  let(:client_rb_content) do
+    basic_config_file
+  end
+
+
+  let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") }
+
+  let(:chef_client_cmd) { %Q[chef-client -c "#{path_to('config/client.rb')}" -lwarn] }
+
+  after do
+    FileUtils.rm_rf(cache_path)
+  end
+
+  # Some Solaris test platforms are too old for IPv6. These tests should not
+  # otherwise be platform dependent, so exclude solaris
+  when_the_chef_server "is running on IPv6", :not_supported_on_solaris do
+
+    when_the_repository "has a cookbook with a no-op recipe" do
+      cookbook 'noop', '1.0.0', { 'metadata.rb' => 'version "1.0.0"' }, "recipes" => {"default.rb" => "#raise 'foo'"}
+      before do
+        file 'config/client.rb', client_rb_content
+        file 'config/validator.pem', validation_pem
+      end
+
+      it "should complete with success" do
+        result = shell_out("#{chef_client_cmd} -o 'noop::default'", :cwd => chef_dir)
+        result.error!
+      end
+
+    end
+
+    when_the_repository "has a cookbook that hits server APIs" do
+
+      recipe=<<-END_RECIPE
+        actual_item = data_bag_item("expect_bag", "expect_item")
+        if actual_item.key?("expect_key") and actual_item["expect_key"] == "expect_value"
+          Chef::Log.info "lookin good"
+        else
+          Chef::Log.error("!" * 80)
+          raise "unexpected data bag item content \#{actual_item.inspect}"
+          Chef::Log.error("!" * 80)
+        end
+
+      END_RECIPE
+
+      data_bag('expect_bag', { 'expect_item' => {"expect_key" => "expect_value"} })
+
+      cookbook 'api-smoke-test', '1.0.0', { 'metadata.rb' => 'version "1.0.0"' }, "recipes" => {"default.rb" => recipe}
+
+      before do
+        file 'config/client.rb', client_rb_content
+        file 'config/validator.pem', validation_pem
+      end
+
+      it "should complete with success" do
+        result = shell_out("#{chef_client_cmd} -o 'api-smoke-test::default'", :cwd => chef_dir)
+        result.error!
+      end
+
+    end
+  end
+end

data/spec/integration/knife/cookbook_api_ipv6_spec.rb

@@ -0,0 +1,111 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'support/shared/integration/integration_helper'
+require 'chef/mixin/shell_out'
+
+describe "Knife cookbook API integration with IPv6" do
+  extend IntegrationSupport
+  include Chef::Mixin::ShellOut
+
+  when_the_chef_server "is bound to IPv6" do
+    let(:chef_zero_opts) { {:host => "::1"} }
+
+    let(:client_key) do
+      <<-END_VALIDATION_PEM
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEApubutqtYYQ5UiA9QhWP7UvSmsfHsAoPKEVVPdVW/e8Svwpyf
+0Xef6OFWVmBE+W442ZjLOe2y6p2nSnaq4y7dg99NFz6X+16mcKiCbj0RCiGqCvCk
+NftHhTgO9/RFvCbmKZ1RKNob1YzLrFpxBHaSh9po+DGWhApcd+I+op+ZzvDgXhNn
+0nauZu3rZmApI/r7EEAOjFedAXs7VPNXhhtZAiLSAVIrwU3ZajtSzgXOxbNzgj5O
+AAAMmThK+71qPdffAdO4J198H6/MY04qgtFo7vumzCq0UCaGZfmeI1UNE4+xQWwP
+HJ3pDAP61C6Ebx2snI2kAd9QMx9Y78nIedRHPwIDAQABAoIBAHssRtPM1GacWsom
+8zfeN6ZbI4KDlbetZz0vhnqDk9NVrpijWlcOP5dwZXVNitnB/HaqCqFvyPDY9JNB
+zI/pEFW4QH59FVDP42mVEt0keCTP/1wfiDDGh1vLqVBYl/ZphscDcNgDTzNkuxMx
+k+LFVxKnn3w7rGc59lALSkpeGvbbIDjp3LUMlUeCF8CIFyYZh9ZvXe4OCxYdyjxb
+i8tnMLKvJ4Psbh5jMapsu3rHQkfPdqzztQUz8vs0NYwP5vWge46FUyk+WNm/IhbJ
+G3YM22nwUS8Eu2bmTtADSJolATbCSkOwQ1D+Fybz/4obfYeGaCdOqB05ttubhenV
+ShsAb7ECgYEA20ecRVxw2S7qA7sqJ4NuYOg9TpfGooptYNA1IP971eB6SaGAelEL
+awYkGNuu2URmm5ElZpwJFFTDLGA7t2zB2xI1FeySPPIVPvJGSiZoFQOVlIg9WQzK
+7jTtFQ/tOMrF+bigEUJh5bP1/7HzqSpuOsPjEUb2aoCTp+tpiRGL7TUCgYEAwtns
+g3ysrSEcTzpSv7fQRJRk1lkBhatgNd0oc+ikzf74DaVLhBg1jvSThDhiDCdB59mr
+Jh41cnR1XqE8jmdQbCDRiFrI1Pq6TPaDZFcovDVE1gue9x86v3FOH2ukPG4d2/Xy
+HevXjThtpMMsWFi0JYXuzXuV5HOvLZiP8sN3lSMCgYANpdxdGM7RRbE9ADY0dWK2
+V14ReTLcxP7fyrWz0xLzEeCqmomzkz3BsIUoouu0DCTSw+rvAwExqcDoDylIVlWO
+fAifz7SeZHbcDxo+3TsXK7zwnLYsx7YNs2+aIv6hzUUbMNmNmXMcZ+IEwx+mRMTN
+lYmZdrA5mr0V83oDFPt/jQKBgC74RVE03pMlZiObFZNtheDiPKSG9Bz6wMh7NWMr
+c37MtZLkg52mEFMTlfPLe6ceV37CM8WOhqe+dwSGrYhOU06dYqUR7VOZ1Qr0aZvo
+fsNPu/Y0+u7rMkgv0fs1AXQnvz7kvKaF0YITVirfeXMafuKEtJoH7owRbur42cpV
+YCAtAoGAP1rHOc+w0RUcBK3sY7aErrih0OPh9U5bvJsrw1C0FIZhCEoDVA+fNIQL
+syHLXYFNy0OxMtH/bBAXBGNHd9gf5uOnqh0pYcbe/uRAxumC7Rl0cL509eURiA2T
++vFmf54y9YdnLXaqv+FhJT6B6V7WX7IpU9BMqJY1cJYXHuHG2KA=
+-----END RSA PRIVATE KEY-----
+END_VALIDATION_PEM
+    end
+
+    let(:cache_path) do
+      Dir.mktmpdir
+    end
+
+    let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") }
+
+    let(:knife_config_flag) { "-c '#{path_to("config/knife.rb")}'" }
+
+    # Some Solaris test platforms are too old for IPv6. These tests should not
+    # otherwise be platform dependent, so exclude solaris
+    context "and the chef_server_url contains an IPv6 literal", :not_supported_on_solaris do
+
+      # This provides helper functions we need such as #path_to()
+      when_the_repository "has the cookbook to be uploaded" do
+
+        let(:knife_rb_content) do
+          <<-END_CLIENT_RB
+chef_server_url "http://[::1]:8889"
+syntax_check_cache_path '#{cache_path}'
+client_key '#{path_to('config/knifeuser.pem')}'
+node_name 'whoisthisis'
+cookbook_path '#{CHEF_SPEC_DATA}/cookbooks'
+END_CLIENT_RB
+        end
+
+        before do
+          file 'config/knife.rb', knife_rb_content
+          file 'config/knifeuser.pem', client_key
+        end
+
+        it "successfully uploads a cookbook" do
+          shell_out!("knife cookbook upload apache2 #{knife_config_flag}", :cwd => chef_dir)
+          versions_list_json = Chef::HTTP::Simple.new("http://[::1]:8889").get("/cookbooks/apache2", "accept" => "application/json")
+          versions_list = Chef::JSONCompat.from_json(versions_list_json)
+          versions_list["apache2"]["versions"].should_not be_empty
+        end
+
+        context "and the cookbook has been uploaded to the server" do
+          before do
+            shell_out!("knife cookbook upload apache2 #{knife_config_flag}", :cwd => chef_dir)
+          end
+
+          it "downloads the cookbook" do
+            s = shell_out!("knife cookbook download apache2 #{knife_config_flag} -d #{cache_path}", :cwd => chef_dir)
+            Dir["#{cache_path}/*"].map {|entry| File.basename(entry)}.should include("apache2-0.0.0")
+          end
+        end
+
+      end
+    end
+  end
+end

data/spec/scripts/ssl-serve.rb

@@ -0,0 +1,52 @@
+# ssl-serve.rb
+# USAGE: ruby ssl-serve.rb
+#
+# ssl-serve is a script that serves a local directory over SSL.
+# You can use it to test various HTTP behaviors in chef, like chef-client's
+# `-j` and `-c` options and remote_file with https connections.
+#
+require 'pp'
+require 'openssl'
+require 'webrick'
+require 'webrick/https'
+
+
+$ssl = true
+
+CHEF_SPEC_DATA = File.expand_path("../../data", __FILE__)
+cert_text = File.read(File.expand_path("ssl/chef-rspec.cert", CHEF_SPEC_DATA))
+cert = OpenSSL::X509::Certificate.new(cert_text)
+key_text = File.read(File.expand_path("ssl/chef-rspec.key", CHEF_SPEC_DATA))
+key = OpenSSL::PKey::RSA.new(key_text)
+
+server_opts = {}
+if $ssl
+server_opts.merge!( { :SSLEnable => true,
+                :SSLVerifyClient => OpenSSL::SSL::VERIFY_NONE,
+                :SSLCertificate => cert,
+                :SSLPrivateKey => key })
+end
+
+
+
+# 5 == debug, 3 == warning
+LOGGER = WEBrick::Log.new(STDOUT, 5)
+DEFAULT_OPTIONS = {
+  :server => 'webrick',
+  :Port => 9000,
+  :Host => 'localhost',
+  :environment => :none,
+  :Logger => LOGGER,
+  :DocumentRoot => File.expand_path("/tmp/chef-118-sampledata")
+  #:AccessLog => [] # Remove this option to enable the access log when debugging.
+}
+
+webrick_opts = DEFAULT_OPTIONS.merge(server_opts)
+pp :webrick_opts => webrick_opts
+
+server = WEBrick::HTTPServer.new(webrick_opts)
+trap 'INT' do server.shutdown end
+
+server.start
+
+

data/spec/spec_helper.rb

@@ -87,7 +87,8 @@ Dir["spec/support/**/*.rb"].
 
 
 OHAI_SYSTEM = Ohai::System.new
-OHAI_SYSTEM.all_plugins("platform")
+OHAI_SYSTEM.require_plugin("os")
+OHAI_SYSTEM.require_plugin("platform")
 TEST_PLATFORM = OHAI_SYSTEM["platform"].dup.freeze
 TEST_PLATFORM_VERSION = OHAI_SYSTEM["platform_version"].dup.freeze
 
@@ -101,15 +102,15 @@ RSpec.configure do |config|
 
   # Add jruby filters here
   config.filter_run_excluding :windows_only => true unless windows?
+  config.filter_run_excluding :not_supported_on_mac_osx_106 => true if mac_osx_106?
   config.filter_run_excluding :not_supported_on_win2k3 => true if windows_win2k3?
   config.filter_run_excluding :not_supported_on_solaris => true if solaris?
   config.filter_run_excluding :win2k3_only => true unless windows_win2k3?
   config.filter_run_excluding :windows64_only => true unless windows64?
   config.filter_run_excluding :windows32_only => true unless windows32?
+  config.filter_run_excluding :solaris_only => true unless solaris?
   config.filter_run_excluding :system_windows_service_gem_only => true unless system_windows_service_gem?
   config.filter_run_excluding :unix_only => true unless unix?
-  # Remove this filter once these issues are fixed: OC-9764, OC-9765, OC-9766, OC-9767
-  config.filter_run_excluding :unsupported_group_provider_platform => true if (os_x? or solaris? or freebsd? or suse?)
   config.filter_run_excluding :supports_cloexec => true unless supports_cloexec?
   config.filter_run_excluding :selinux_only => true unless selinux_enabled?
   config.filter_run_excluding :ruby_18_only => true unless ruby_18?
@@ -117,9 +118,9 @@ RSpec.configure do |config|
   config.filter_run_excluding :ruby_gte_19_only => true unless ruby_gte_19?
   config.filter_run_excluding :ruby_20_only => true unless ruby_20?
   config.filter_run_excluding :ruby_gte_20_only => true unless ruby_gte_20?
-  config.filter_run_excluding :requires_root => true unless ENV['USER'] == 'root' || ENV['LOGIN'] == 'root'
-  config.filter_run_excluding :requires_root_or_running_windows => true unless (ENV['USER'] == 'root' or windows?)
-  config.filter_run_excluding :requires_unprivileged_user => true if ENV['USER'] == 'root'
+  config.filter_run_excluding :requires_root => true unless root?
+  config.filter_run_excluding :requires_root_or_running_windows => true unless (root? || windows?)
+  config.filter_run_excluding :requires_unprivileged_user => true if root?
   config.filter_run_excluding :uses_diff => true unless has_diff?
 
   running_platform_arch = `uname -m`.strip