chef 11.18.12-x86-mingw32 → 12.0.0.alpha.0-x86-mingw32

data/spec/integration/knife/chefignore_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'chef/knife/list'
 require 'chef/knife/show'
 
-describe 'chefignore tests', :workstation do
+describe 'chefignore tests' do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/common_options_spec.rb

@@ -18,7 +18,7 @@
 require 'support/shared/integration/integration_helper'
 require 'chef/knife/raw'
 
-describe 'knife common options', :workstation do
+describe 'knife common options' do
   extend IntegrationSupport
   include KnifeSupport
 
@@ -53,10 +53,9 @@ describe 'knife common options', :workstation do
       # 0.0.0.0 is not a valid address to bind to on windows.
       context 'And chef_zero.host is 0.0.0.0', :unix_only do
         before(:each) { Chef::Config.chef_zero.host = '0.0.0.0' }
- 
+
         it 'knife raw /nodes/x should retrieve the role' do
           knife('raw /nodes/x').should_succeed /"name": "x"/
-          Chef::Config.chef_server_url.should == 'http://0.0.0.0:8889'
         end
       end
 
@@ -109,5 +108,53 @@ EOM
       knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed /"name": "x"/
       Chef::Config.chef_server_url.should == 'http://localhost:9999'
     end
+
+    context 'when the default port (8889) is already bound' do
+      before :each do
+        begin
+          @server = ChefZero::Server.new(:host => 'localhost', :port => 8889)
+          @server.start_background
+        rescue Errno::EADDRINUSE
+          # OK.  Don't care who has it in use, as long as *someone* does.
+        end
+      end
+      after :each do
+        @server.stop if @server
+      end
+
+      it 'knife raw -z /nodes/x retrieves the node' do
+        knife('raw -z /nodes/x').should_succeed /"name": "x"/
+        expect(URI(Chef::Config.chef_server_url).port).to be > 8889
+      end
+    end
+
+    context 'when port 9999 is already bound' do
+      before :each do
+        begin
+          @server = ChefZero::Server.new(:host => 'localhost', :port => 9999)
+          @server.start_background
+        rescue Errno::EADDRINUSE
+          # OK.  Don't care who has it in use, as long as *someone* does.
+        end
+      end
+      after :each do
+        @server.stop if @server
+      end
+
+      it 'knife raw -z --chef-zero-port=9999-20000 /nodes/x' do
+        knife('raw -z --chef-zero-port=9999-20000 /nodes/x').should_succeed /"name": "x"/
+        expect(URI(Chef::Config.chef_server_url).port).to be > 9999
+      end
+
+      it 'knife raw -z --chef-zero-port=9999-9999,19423' do
+        knife('raw -z --chef-zero-port=9999-9999,19423 /nodes/x').should_succeed /"name": "x"/
+        expect(URI(Chef::Config.chef_server_url).port).to be == 19423
+      end
+    end
+
+    it 'knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node' do
+      knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed /"name": "x"/
+      Chef::Config.chef_server_url.should == 'http://localhost:9999'
+    end
   end
 end

data/spec/integration/knife/cookbook_api_ipv6_spec.rb

@@ -18,7 +18,7 @@
 require 'support/shared/integration/integration_helper'
 require 'chef/mixin/shell_out'
 
-describe "Knife cookbook API integration with IPv6", :workstation do
+describe "Knife cookbook API integration with IPv6" do
   extend IntegrationSupport
   include Chef::Mixin::ShellOut
 

data/spec/integration/knife/delete_spec.rb

@@ -20,7 +20,7 @@ require 'chef/knife/delete'
 require 'chef/knife/list'
 require 'chef/knife/raw'
 
-describe 'knife delete', :workstation do
+describe 'knife delete' do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/deps_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'support/shared/context/config'
 require 'chef/knife/deps'
 
-describe 'knife deps', :workstation do
+describe 'knife deps' do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/diff_spec.rb

@@ -18,7 +18,7 @@
 require 'support/shared/integration/integration_helper'
 require 'chef/knife/diff'
 
-describe 'knife diff', :workstation do
+describe 'knife diff' do
   extend IntegrationSupport
   include KnifeSupport
 
@@ -275,7 +275,7 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife diff reports an error and does a textual diff' do
-          knife('diff /environments/x.json').should_succeed(/-  "name": "x"/, :stderr => /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n/)
+          knife('diff /environments/x.json').should_succeed(/-  "name": "x"/, :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n")
         end
       end
     end
@@ -528,7 +528,7 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife diff reports an error and does a textual diff' do
-          knife('diff /environments/x.json').should_succeed(/-  "name": "x"/, :stderr => /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n/)
+          knife('diff /environments/x.json').should_succeed(/-  "name": "x"/, :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n")
         end
       end
     end

data/spec/integration/knife/download_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'chef/knife/download'
 require 'chef/knife/diff'
 
-describe 'knife download', :workstation do
+describe 'knife download' do
   extend IntegrationSupport
   include KnifeSupport
 
@@ -496,7 +496,7 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife download succeeds' do
-          knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n", :stderr => /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n/
+          knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n", :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n"
           knife('diff --name-status /environments/x.json').should_succeed ''
         end
       end
@@ -946,7 +946,7 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife download succeeds' do
-          knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n", :stderr => /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n/
+          knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n", :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n"
           knife('diff --name-status /environments/x.json').should_succeed ''
         end
       end

data/spec/integration/knife/list_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'support/shared/context/config'
 require 'chef/knife/list'
 
-describe 'knife list', :workstation do
+describe 'knife list' do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/raw_spec.rb

@@ -20,7 +20,7 @@ require 'support/shared/context/config'
 require 'chef/knife/raw'
 require 'chef/knife/show'
 
-describe 'knife raw', :workstation do
+describe 'knife raw' do
   extend IntegrationSupport
   include KnifeSupport
   include AppServerSupport
@@ -44,16 +44,12 @@ describe 'knife raw', :workstation do
   "chef_type": "node",
   "chef_environment": "_default",
   "override": {
-
   },
   "normal": {
-
   },
   "default": {
-
   },
   "automatic": {
-
   },
   "run_list": [
 
@@ -74,16 +70,13 @@ EOM
   "json_class": "Chef::Role",
   "chef_type": "role",
   "default_attributes": {
-
   },
   "override_attributes": {
-
   },
   "run_list": [
 
   ],
   "env_run_lists": {
-
   }
 }
 EOM
@@ -118,16 +111,13 @@ EOM
   "json_class": "Chef::Role",
   "chef_type": "role",
   "default_attributes": {
-
   },
   "override_attributes": {
-
   },
   "run_list": [
 
   ],
   "env_run_lists": {
-
   }
 }
 EOM

data/spec/integration/knife/redirection_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'support/shared/context/config'
 require 'chef/knife/list'
 
-describe 'redirection', :workstation do
+describe 'redirection' do
   extend IntegrationSupport
   include KnifeSupport
   include AppServerSupport

data/spec/integration/knife/serve_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'chef/knife/serve'
 require 'chef/server_api'
 
-describe 'knife serve', :workstation do
+describe 'knife serve' do
   extend IntegrationSupport
   include KnifeSupport
   include AppServerSupport
@@ -31,7 +31,7 @@ describe 'knife serve', :workstation do
       exception = nil
       t = Thread.new do
         begin
-          knife('serve')
+          knife('serve --chef-zero-port=8889')
         rescue
           exception = $!
         end

data/spec/integration/knife/show_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'support/shared/context/config'
 require 'chef/knife/show'
 
-describe 'knife show', :workstation do
+describe 'knife show' do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/upload_spec.rb

@@ -20,7 +20,7 @@ require 'chef/knife/upload'
 require 'chef/knife/diff'
 require 'chef/knife/raw'
 
-describe 'knife upload', :workstation do
+describe 'knife upload' do
   extend IntegrationSupport
   include KnifeSupport
 
@@ -237,7 +237,7 @@ Created /data_bags/x/y.json
 EOM
           knife('diff --name-status /data_bags').should_succeed <<EOM
 EOM
-          Chef::JSONCompat.parse(knife('raw /data/x/y').stdout, :create_additions => false).keys.sort.should == [ 'foo', 'id' ]
+          JSON.parse(knife('raw /data/x/y').stdout, :create_additions => false).keys.sort.should == [ 'foo', 'id' ]
         end
 
         it 'knife upload /data_bags/x /data_bags/x/y.json uploads x once' do
@@ -256,7 +256,7 @@ Created /data_bags/x
 Created /data_bags/x/y.json
 EOM
           knife('diff --name-status /data_bags').should_succeed ''
-          result = Chef::JSONCompat.parse(knife('raw /data/x/y').stdout, :create_additions => false)
+          result = JSON.parse(knife('raw /data/x/y').stdout, :create_additions => false)
           result.keys.sort.should == [ 'chef_type', 'data_bag', 'id' ]
           result['chef_type'].should == 'aaa'
           result['data_bag'].should == 'bbb'
@@ -528,8 +528,8 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife upload tries and fails' do
-          knife('upload /environments/x.json').should_fail /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n.+ERROR: \/environments\/x.json failed to write: Parse error reading JSON: parse error: premature EOF\n/m
-          knife('diff --name-status /environments/x.json').should_succeed "M\t/environments/x.json\n", :stderr => /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n/
+          knife('upload /environments/x.json').should_fail "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\nERROR: /environments/x.json failed to write: Parse error reading JSON: A JSON text must at least contain two octets!\n"
+          knife('diff --name-status /environments/x.json').should_succeed "M\t/environments/x.json\n", :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n"
         end
       end
 
@@ -554,7 +554,7 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife upload tries and fails' do
-          knife('upload /environments/x.json').should_fail /ERROR: \/environments failed to create_child: Parse error reading JSON creating child 'x.json': parse error: premature EOF\n/
+          knife('upload /environments/x.json').should_fail "ERROR: /environments failed to create_child: Parse error reading JSON creating child 'x.json': A JSON text must at least contain two octets!\n"
           knife('diff --name-status /environments/x.json').should_succeed "A\t/environments/x.json\n"
         end
       end
@@ -1007,8 +1007,8 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife upload tries and fails' do
-          knife('upload /environments/x.json').should_fail /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n.+ERROR: \/environments\/x.json failed to write: Parse error reading JSON: parse error: premature EOF\n/m
-          knife('diff --name-status /environments/x.json').should_succeed "M\t/environments/x.json\n", :stderr => /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n/
+          knife('upload /environments/x.json').should_fail "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\nERROR: /environments/x.json failed to write: Parse error reading JSON: A JSON text must at least contain two octets!\n"
+          knife('diff --name-status /environments/x.json').should_succeed "M\t/environments/x.json\n", :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n"
         end
       end
 
@@ -1033,7 +1033,7 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife upload tries and fails' do
-          knife('upload /environments/x.json').should_fail /ERROR: \/environments failed to create_child: Parse error reading JSON creating child 'x.json': parse error: premature EOF\n/
+          knife('upload /environments/x.json').should_fail "ERROR: /environments failed to create_child: Parse error reading JSON creating child 'x.json': A JSON text must at least contain two octets!\n"
           knife('diff --name-status /environments/x.json').should_succeed "A\t/environments/x.json\n"
         end
       end

data/spec/spec_helper.rb

@@ -97,9 +97,6 @@ RSpec.configure do |config|
   config.filter_run :focus => true
   config.filter_run_excluding :external => true
 
-  # Only run these tests on platforms that are also chef workstations
-  config.filter_run_excluding :workstation if solaris?
-
   # Tests that randomly fail, but may have value.
   config.filter_run_excluding :volatile => true
   config.filter_run_excluding :volatile_on_solaris => true if solaris?
@@ -110,11 +107,8 @@ RSpec.configure do |config|
   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 :windows_2008r2_or_later => true unless windows_2008r2_or_later?
   config.filter_run_excluding :windows64_only => true unless windows64?
   config.filter_run_excluding :windows32_only => true unless windows32?
-  config.filter_run_excluding :windows_powershell_dsc_only => true unless windows_powershell_dsc?
-  config.filter_run_excluding :windows_powershell_no_dsc_only => true unless ! windows_powershell_dsc?
   config.filter_run_excluding :windows_domain_joined_only => true unless windows_domain_joined?
   config.filter_run_excluding :solaris_only => true unless solaris?
   config.filter_run_excluding :system_windows_service_gem_only => true unless system_windows_service_gem?
@@ -185,6 +179,3 @@ module WEBrick
     end
   end
 end
-
-# Enough stuff needs json serialization that I'm just adding it here for equality asserts
-require 'chef/json_compat'

data/spec/support/pedant/pedant_config.rb

@@ -21,7 +21,8 @@
 ################################################################################
 # You MUST specify the address of the server the API requests will be
 # sent to.  Only specify protocol, hostname, and port.
-chef_server 'http://127.0.0.1:8889'
+# NOTE this is assigned in run_pedant.rb, because it's possible 8889 will not be the port chosen.
+#chef_server 'http://127.0.0.1:8889'
 
 # If you are doing development testing, you can specify the address of
 # the Solr server.  The presence of this parameter will enable tests

data/spec/support/pedant/run_pedant.rb

@@ -26,7 +26,7 @@ def start_server(chef_repo_path)
   chef_fs = Chef::ChefFS::Config.new.local_fs
   data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs)
   data_store = ChefZero::DataStore::V1ToV2Adapter.new(data_store, 'chef', :org_defaults => ChefZero::DataStore::V1ToV2Adapter::ORG_DEFAULTS)
-  server = ChefZero::Server.new(:port => 8889, :data_store => data_store)#, :log_level => :debug)
+  server = ChefZero::Server.new(:port => 8889.upto(9999), :data_store => data_store)#, :log_level => :debug)
   server.start_background
   server
 end
@@ -46,6 +46,7 @@ begin
 
   Pedant.config.suite = 'api'
   Pedant.config[:config_file] = 'spec/support/pedant/pedant_config.rb'
+  Pedant.config.chef_server = server.url
   Pedant.setup([
     '--skip-knife',
     '--skip-validation',

data/spec/support/platform_helpers.rb

@@ -27,6 +27,11 @@ def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end
 
+def ohai
+  # This is defined in spec_helper; it has the `platform` populated.
+  OHAI_SYSTEM
+end
+
 require 'wmi-lite/wmi' if windows?
 
 def windows_domain_joined?
@@ -43,30 +48,6 @@ def windows_win2k3?
   (host['version'] && host['version'].start_with?("5.2"))
 end
 
-def windows_2008r2_or_later?
-  return false unless windows?
-  wmi = WmiLite::Wmi.new
-  host = wmi.first_of('Win32_OperatingSystem')
-  version = host['version']
-  return false unless version
-  components = version.split('.').map do | component |
-    component.to_i
-  end
-  components.length >=2 && components[0] >= 6 && components[1] >= 1
-end
-
-def windows_powershell_dsc?
-  return false unless windows?
-  supports_dsc = false
-  begin
-    wmi = WmiLite::Wmi.new('root/microsoft/windows/desiredstateconfiguration')
-    lcm = wmi.query("SELECT * FROM meta_class WHERE __this ISA 'MSFT_DSCLocalConfigurationManager'")
-    supports_dsc = !! lcm
-  rescue WmiLite::WmiException
-  end
-  supports_dsc
-end
-
 def mac_osx_106?
   if File.exists? "/usr/bin/sw_vers"
     result = shell_out("/usr/bin/sw_vers")

data/spec/support/shared/integration/integration_helper.rb

@@ -21,6 +21,7 @@ require 'tmpdir'
 require 'fileutils'
 require 'chef/config'
 require 'chef_zero/rspec'
+require 'json'
 require 'support/shared/integration/knife_support'
 require 'support/shared/integration/app_server_support'
 require 'spec_helper'
@@ -68,7 +69,7 @@ module IntegrationSupport
         File.open(filename, 'w') do |file|
           raw = case contents
                 when Hash
-                  Chef::JSONCompat.to_json_pretty(contents)
+                  JSON.pretty_generate(contents)
                 when Array
                   contents.join("\n")
                 else