kitchen-qemu 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b271e7a403bb173917ba2844c8438c3090fc17fd
-  data.tar.gz: 060fadc6ce149e8aa44fcf92f6e33511001d3f1e
+  metadata.gz: 0b384b431d25be6af9629e25257b22aae196b6ee
+  data.tar.gz: a357e929445b2ed642d3afe3e1c6b2dfa09c65c6
 SHA512:
-  metadata.gz: 5c211c9f3e8919de20afbea050d1ee7aff057917a5f9ace7f1f8b2eeb0441c88af10a60a3f3996f45b7a51026e3739fad5f0ab5886e46ca26fb85e0ca8b57b89
-  data.tar.gz: 85aff6d2b0546d56bafef287b48570fd06445518b2cd7bcc14407383729cc32cc4c5de9d95341e453415168f3e8135e914c5c09436bd264d020e8be455e21c0d
+  metadata.gz: c2528d3868e9d8f30466636577dc0c8e4823be92243171ae1e31c6be6db00b298f7629b93361f9a776f265953db9f89d7f8eaa3d5589c2d67109736644901a62
+  data.tar.gz: 3c6efcde7a3193201f4f2aaafd2cdf063da363ca3b0f80a6c0bdc613b0febe778c72030dd1a11e8f79584f125cc0dfa111cbf85a61d4d77e4255d9097fca0734

data/lib/kitchen/driver/qemu.rb

@@ -75,8 +75,7 @@ module Kitchen
           begin
             mon = UNIXSocket.new(monitor)
           rescue Errno::ECONNREFUSED
-            File.delete(spice_path)
-            File.delete(monitor)
+            cleanup!
           else
             mon.close
             raise ActionFailed, "QEMU instance #{instance.to_str} already running."
@@ -138,7 +137,10 @@ module Kitchen
             error = err.read.strip
           end
         end
-        raise ActionFailed, error if error
+        if error
+          cleanup!
+          raise ActionFailed, error
+        end
 
         if hostname == fqdn
           names = fqdn
@@ -179,8 +181,7 @@ module Kitchen
           raise ActionFailed, "QEMU instance #{instance.to_str} is unresponsive"
         end
 
-        File.delete(spice_path)
-        File.delete(monitor)
+        cleanup!
       end
 
       private
@@ -243,6 +244,16 @@ tY4IM9IaSC2LuPFVc0Kx6TwObdeQScOokIxL3HfayfLKieTLC+w2
         File.open(path, File::CREAT|File::TRUNC|File::RDWR, 0600) { |f| f.write(@@privkey) }
       end
 
+      def cleanup!
+        [ spice_path, monitor_path ].each do |path|
+          begin
+            File.delete(path)
+          rescue Errno::ENOENT
+            # do nothing
+          end
+        end
+      end
+
     end
   end
 end

data/lib/kitchen/driver/qemu_version.rb

@@ -17,6 +17,6 @@
 module Kitchen
   module Driver
     # Version string for the QEMU Kitchen driver
-    QEMU_VERSION = '0.1.0'
+    QEMU_VERSION = '0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-qemu
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Emil Renner Berthing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen