Merge pull request #794 from chef/tk_update

updating test-kitchen pin

.bundle/config

@@ -1,4 +1,3 @@
 ---
 BUNDLE_WITHOUT: omnibus_package
-BUNDLE_DISABLE_SHARED_GEMS: '1'
 BUNDLE_FROZEN: '1'

Gemfile

@@ -44,7 +44,7 @@ group(:omnibus_package) do
   gem "chef-provisioning-vagrant", ">= 0.11.0"
   gem "chef-vault"
   # The chef version is pinned by "rake dependencies", which grabs the current version from omnibus.
-  gem "chef", github: "chef/chef", branch: "v12.9.38"
+  gem "chef", github: "chef/chef", branch: "v12.9.41"
   gem "cheffish", ">= 2.0.3"
   gem "chefspec"
   gem "fauxhai"
@@ -55,7 +55,7 @@ group(:omnibus_package) do
   gem "kitchen-vagrant"
   gem "knife-windows"
   gem "ohai", ">= 8.13.0"
-  gem "test-kitchen", ">= 1.6.0", github: "test-kitchen/test-kitchen" # until a release with relaxed cucumber in it
+  gem "test-kitchen"
 
   # All of the following used to be software definitions we included:
   gem "knife-spork"

Gemfile.lock

@@ -7,12 +7,12 @@ GIT
 
 GIT
   remote: git://github.com/chef/chef.git
-  revision: 5371a896228647bdb1b9260bc36b3afc756897c7
-  branch: v12.9.38
+  revision: a0d98d2cfe6a3f1485fc562a0b5589ba4443e592
+  branch: v12.9.41
   specs:
-    chef (12.9.38)
+    chef (12.9.41)
       bundler (>= 1.10)
-      chef-config (= 12.9.38)
+      chef-config (= 12.9.41)
       chef-zero (~> 4.5)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -36,23 +36,11 @@ GIT
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (12.9.38)
+    chef-config (12.9.41)
       fuzzyurl (~> 0.8.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
 
-GIT
-  remote: git://github.com/test-kitchen/test-kitchen.git
-  revision: 973d42e43a33d1fc78f803682d31bb50ee709628
-  specs:
-    test-kitchen (1.7.2)
-      mixlib-install (~> 1.0, >= 1.0.4)
-      mixlib-shellout (>= 1.2, < 3.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 4.0)
-      safe_yaml (~> 1.0)
-      thor (~> 0.18)
-
 PATH
   remote: .
   specs:
@@ -460,7 +448,7 @@ GEM
       rspec-mocks (~> 3.2)
     mixlib-cli (1.5.0)
     mixlib-config (2.2.1)
-    mixlib-install (1.0.5)
+    mixlib-install (1.0.6)
       artifactory (>= 2.3.0)
       mixlib-shellout (>= 2.2.6)
       mixlib-versioning (>= 1.1.0)
@@ -640,6 +628,13 @@ GEM
       uuid (~> 2.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
+    test-kitchen (1.7.3)
+      mixlib-install (~> 1.0, >= 1.0.4)
+      mixlib-shellout (>= 1.2, < 3.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.9, < 4.0)
+      safe_yaml (~> 1.0)
+      thor (~> 0.18)
     thor (0.19.1)
     thread_safe (0.3.5)
     timers (4.0.4)
@@ -665,7 +660,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0)
-    winrm-fs (0.4.1)
+    winrm-fs (0.4.2)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -718,7 +713,7 @@ DEPENDENCIES
   rubocop (~> 0.37.2)
   ruby-prof
   ruby-shadow
-  test-kitchen (>= 1.6.0)!
+  test-kitchen
   winrm-fs
   yard
 

Gemfile.windows.lock

@@ -8,12 +8,12 @@ GIT
 
 GIT
   remote: git://github.com/chef/chef.git
-  revision: 5371a896228647bdb1b9260bc36b3afc756897c7
-  ref: 5371a896228647bdb1b9260bc36b3afc756897c7
+  revision: a0d98d2cfe6a3f1485fc562a0b5589ba4443e592
+  ref: a0d98d2cfe6a3f1485fc562a0b5589ba4443e592
   specs:
-    chef (12.9.38-universal-mingw32)
+    chef (12.9.41-universal-mingw32)
       bundler (>= 1.10)
-      chef-config (= 12.9.38)
+      chef-config (= 12.9.41)
       chef-zero (~> 4.5)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -48,24 +48,11 @@ GIT
       win32-service (~> 0.8.7)
       windows-api (~> 0.4.4)
       wmi-lite (~> 1.0)
-    chef-config (12.9.38)
+    chef-config (12.9.41)
       fuzzyurl (~> 0.8.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
 
-GIT
-  remote: git://github.com/test-kitchen/test-kitchen.git
-  revision: 973d42e43a33d1fc78f803682d31bb50ee709628
-  ref: 973d42e43a33d1fc78f803682d31bb50ee709628
-  specs:
-    test-kitchen (1.7.2)
-      mixlib-install (~> 1.0, >= 1.0.4)
-      mixlib-shellout (>= 1.2, < 3.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 4.0)
-      safe_yaml (~> 1.0)
-      thor (~> 0.18)
-
 PATH
   remote: .
   specs:
@@ -473,7 +460,7 @@ GEM
       rspec-mocks (~> 3.2)
     mixlib-cli (1.5.0)
     mixlib-config (2.2.1)
-    mixlib-install (1.0.5)
+    mixlib-install (1.0.6)
       artifactory (>= 2.3.0)
       mixlib-shellout (>= 2.2.6)
       mixlib-versioning (>= 1.1.0)
@@ -655,6 +642,13 @@ GEM
       uuid (~> 2.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
+    test-kitchen (1.7.3)
+      mixlib-install (~> 1.0, >= 1.0.4)
+      mixlib-shellout (>= 1.2, < 3.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.9, < 4.0)
+      safe_yaml (~> 1.0)
+      thor (~> 0.18)
     thor (0.19.1)
     thread_safe (0.3.5)
     timers (4.0.4)
@@ -699,7 +693,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0)
-    winrm-fs (0.4.1)
+    winrm-fs (0.4.2)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -846,7 +840,7 @@ DEPENDENCIES
   mixlib-authentication (= 1.4.0)
   mixlib-cli (= 1.5.0)
   mixlib-config (= 2.2.1)
-  mixlib-install (= 1.0.5)
+  mixlib-install (= 1.0.6)
   mixlib-log (= 1.6.0)
   mixlib-shellout (= 2.2.6)
   mixlib-versioning (= 1.1.0)
@@ -919,7 +913,7 @@ DEPENDENCIES
   stuartpreston-azure-sdk-for-ruby (= 0.7.1)
   syslog-logger (= 1.6.8)
   systemu (= 2.6.5)
-  test-kitchen!
+  test-kitchen (= 1.7.3)
   thor (= 0.19.1)
   thread_safe (= 0.3.5)
   timers (= 4.0.4)
@@ -932,7 +926,7 @@ DEPENDENCIES
   uuidtools (= 2.1.5)
   varia_model (= 0.4.1)
   winrm (= 1.7.3)
-  winrm-fs (= 0.4.1)
+  winrm-fs (= 0.4.2)
   wmi-lite (= 1.0.0)
   xml-simple (= 1.1.5)
   yajl-ruby (= 1.2.1)

acceptance/Gemfile.lock

@@ -65,7 +65,8 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.8.1)
+    chef-config (12.9.38)
+      fuzzyurl (~> 0.8.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     cleanroom (1.0.0)
@@ -79,6 +80,7 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
+    fuzzyurl (0.8.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -117,7 +119,7 @@ GEM
       rspec-expectations (~> 3.2)
       rspec-mocks (~> 3.2)
     mixlib-config (2.2.1)
-    mixlib-install (1.0.5)
+    mixlib-install (1.0.6)
       artifactory (>= 2.3.0)
       mixlib-shellout (>= 2.2.6)
       mixlib-versioning (>= 1.1.0)
@@ -193,7 +195,7 @@ GEM
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
-    test-kitchen (1.7.2)
+    test-kitchen (1.7.3)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -217,7 +219,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0)
-    winrm-fs (0.4.1)
+    winrm-fs (0.4.2)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)

omnibus/Gemfile.lock

@@ -79,7 +79,8 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.8.1)
+    chef-config (12.9.38)
+      fuzzyurl (~> 0.8.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     chef-sugar (3.3.0)
@@ -91,6 +92,7 @@ GEM
     ffi (1.9.10)
     ffi-yajl (2.2.3)
       libyajl2 (~> 1.2)
+    fuzzyurl (0.8.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -119,7 +121,7 @@ GEM
       rspec-mocks (~> 3.2)
     mixlib-cli (1.5.0)
     mixlib-config (2.2.1)
-    mixlib-install (1.0.5)
+    mixlib-install (1.0.6)
       artifactory (>= 2.3.0)
       mixlib-shellout (>= 2.2.6)
       mixlib-versioning (>= 1.1.0)
@@ -190,7 +192,7 @@ GEM
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
     systemu (2.6.5)
-    test-kitchen (1.7.2)
+    test-kitchen (1.7.3)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -211,7 +213,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0)
-    winrm-fs (0.4.1)
+    winrm-fs (0.4.2)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)