test-kitchen 1.23.0 → 1.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 885f8d3b08f1f4c860cd55c370cefc6f2b35e87dc2607ce9f6d60c39788bfd86
-  data.tar.gz: 352335dacee5a0ed1dbe5067d658bd2cd85bac1d0ec39c49a1283871c8604953
+  metadata.gz: 9219cf297ee744f00b2e77febd43103a4cfbbb4b8e12c31e4be80cf66cf30127
+  data.tar.gz: d2bad7b27981a7dad6b2a3437a828c91626c196233bd5d81060e6cc91cfc8a9c
 SHA512:
-  metadata.gz: cc58bb9f82520bf0e616620a874d0452ac5ed0889cc7e28f0eb1aacfbb8e609436b65ff6f3f687044c3f896fc4846697cf96c78b8adee54816647c9a2f787373
-  data.tar.gz: '0909b191b4dc6c965ccf6e5afb59b67cff485035b049de9bea218c89f31753312ab970ca68217dc4c7f4eaa6b33ea814f67ce5a9cda3e31a0efa0a66bc2a3dd1'
+  metadata.gz: e09373f94e6b8cde1525c248a87c722b629a28d4afa005ca0f512699968898ca119778f8cddc35b8ae03d85802567019e9edd69c8566470df693f6bf0c7ae4fb
+  data.tar.gz: 354ab8c97efd79db86a6c2e49533057281c76bbb85a683ef69c2cf640ac8c294db04ee5dd4e0501f7978026b2460cd585f83b7aafc374f6202606fc5d85c6bfa

data/.github/lock.yml

@@ -0,0 +1 @@
+daysUntilLock: 60

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [v1.23.2](https://github.com/test-kitchen/test-kitchen/tree/v1.23.2) (2018-08-06)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.23.0...v1.23.2)
+
+**Closed issues:**
+
+- Race condition: conflicting chdir during another chdir block [\#1416](https://github.com/test-kitchen/test-kitchen/issues/1416)
+
+**Merged pull requests:**
+
+- Synchronize calls to chdir to be thread safe [\#1430](https://github.com/test-kitchen/test-kitchen/pull/1430) ([s-bernard](https://github.com/s-bernard))
+- Catch 'Operation already in progress' as seen on Ubuntu on WSL [\#1435](https://github.com/test-kitchen/test-kitchen/pull/1435) ([bdwyertech](https://github.com/bdwyertech))
+- Fix \#1104 add supplemental kitchen commands [\#1105](https://github.com/test-kitchen/test-kitchen/pull/1105) ([4-20ma](https://github.com/4-20ma))
+
+
 ## [v1.23.0](https://github.com/test-kitchen/test-kitchen/tree/v1.23.0) (2018-07-30)
 [Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.22.0...v1.23.0)
 

data/lib/kitchen.rb

@@ -61,6 +61,9 @@ module Kitchen
     # @return [Mutex] a common mutex for global coordination
     attr_accessor :mutex
 
+    # @return [Mutex] a mutex used for Dir.chdir coordination
+    attr_accessor :mutex_chdir
+
     # Returns the root path of the Kitchen gem source code.
     #
     # @return [Pathname] root path of gem
@@ -147,3 +150,6 @@ Kitchen.logger = Kitchen.default_logger
 
 # Setup a collection of instance crash exceptions for error reporting
 Kitchen.mutex = Mutex.new
+
+# Initialize the mutex for Dir.chdir coordination
+Kitchen.mutex_chdir = Mutex.new

data/lib/kitchen/rake_tasks.rb

@@ -53,15 +53,28 @@ module Kitchen
     # @api private
     def define
       namespace "kitchen" do
+        kitchen_commands = %w{create converge setup verify destroy}
         config.instances.each do |instance|
           desc "Run #{instance.name} test instance"
           task instance.name do
             instance.test(:always)
           end
+
+          kitchen_commands.each do |cmd|
+            namespace cmd do
+              task instance.name do
+                instance.send(cmd)
+              end
+              desc "Run all #{cmd} instances"
+              task "all" => config.instances.map(&:name)
+            end
+          end
         end
 
         desc "Run all test instances"
         task "all" => config.instances.map(&:name)
+
+        kitchen_commands.each { |cmd| task cmd => "#{cmd}:all" }
       end
     end
   end

data/lib/kitchen/transport/ssh.rb

@@ -229,7 +229,7 @@ module Kitchen
         PING_COMMAND = "echo '[SSH] Established'".freeze
 
         RESCUE_EXCEPTIONS_ON_ESTABLISH = [
-          Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
+          Errno::EACCES, Errno::EALREADY, Errno::EADDRINUSE, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
           Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH, Errno::EPIPE,
           Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, Net::SSH::ConnectionTimeout,
           Timeout::Error

data/lib/kitchen/util.rb

@@ -155,25 +155,30 @@ module Kitchen
     # and doesn't like fake directories (C:\Documents and Settings)
     # It also does not do any sort of error checking, so things one would
     # expect to fail just return an empty list
+    #
+    # @note Dir.chdir is applied to the process, thus it is not thread-safe
+    # and must be synchronized.
     def self.list_directory(path, include_dot: false, recurse: false)
       # Things (such as tests) are relying on this to not blow up if
       # the directory does not exist
       return [] if !Dir.exist?(path)
 
-      Dir.chdir(path) do
-        glob_pattern = if recurse
-                         "**/*"
-                       else
-                         "*"
-                       end
-        flags = if include_dot
-                  [File::FNM_DOTMATCH]
-                else
-                  []
-                end
-        Dir.glob(glob_pattern, *flags)
-          .reject { |f| [".", ".."].include?(f) }
-          .map { |f| File.join(path, f) }
+      Kitchen.mutex_chdir.synchronize do
+        Dir.chdir(path) do
+          glob_pattern = if recurse
+                           "**/*"
+                         else
+                           "*"
+                         end
+          flags = if include_dot
+                    [File::FNM_DOTMATCH]
+                  else
+                    []
+                  end
+          Dir.glob(glob_pattern, *flags)
+            .reject { |f| [".", ".."].include?(f) }
+            .map { |f| File.join(path, f) }
+        end
       end
     end
 
@@ -188,11 +193,16 @@ module Kitchen
     # @param pattern [String] The pattern to match
     # @param flags [Integer] You can specify flags you would have passed to Dir.glob
     # @return Files matching the specified pattern in the given path
+    #
+    # @note Dir.chdir is applied to the process, thus it is not thread-safe
+    # and must be synchronized.
     def self.safe_glob(path, pattern, *flags)
       return [] if !Dir.exist?(path)
 
-      Dir.chdir(path) do
-        Dir.glob(pattern, *flags).map { |f| File.join(path, f) }
+      Kitchen.mutex_chdir.synchronize do
+        Dir.chdir(path) do
+          Dir.glob(pattern, *flags).map { |f| File.join(path, f) }
+        end
       end
     end
   end

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "1.23.0".freeze
+  VERSION = "1.23.2".freeze
 end

data/spec/kitchen/transport/ssh_spec.rb

@@ -695,8 +695,8 @@ describe Kitchen::Transport::Ssh::Connection do
 
   describe "establishing a connection" do
     [
-      Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
-      Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH,
+      Errno::EACCES, Errno::EALREADY, Errno::EADDRINUSE, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
+      Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH, Errno::EPIPE,
       Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, Net::SSH::ConnectionTimeout,
       Timeout::Error
     ].each do |klass|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.23.2
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -319,6 +319,7 @@ extra_rdoc_files: []
 files:
 - ".gitattributes"
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/lock.yml"
 - ".gitignore"
 - ".kitchen.appveyor.yml"
 - ".kitchen.dokken.yml"