kitchen-qemu 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b271e7a403bb173917ba2844c8438c3090fc17fd
4
- data.tar.gz: 060fadc6ce149e8aa44fcf92f6e33511001d3f1e
3
+ metadata.gz: 0b384b431d25be6af9629e25257b22aae196b6ee
4
+ data.tar.gz: a357e929445b2ed642d3afe3e1c6b2dfa09c65c6
5
5
  SHA512:
6
- metadata.gz: 5c211c9f3e8919de20afbea050d1ee7aff057917a5f9ace7f1f8b2eeb0441c88af10a60a3f3996f45b7a51026e3739fad5f0ab5886e46ca26fb85e0ca8b57b89
7
- data.tar.gz: 85aff6d2b0546d56bafef287b48570fd06445518b2cd7bcc14407383729cc32cc4c5de9d95341e453415168f3e8135e914c5c09436bd264d020e8be455e21c0d
6
+ metadata.gz: c2528d3868e9d8f30466636577dc0c8e4823be92243171ae1e31c6be6db00b298f7629b93361f9a776f265953db9f89d7f8eaa3d5589c2d67109736644901a62
7
+ data.tar.gz: 3c6efcde7a3193201f4f2aaafd2cdf063da363ca3b0f80a6c0bdc613b0febe778c72030dd1a11e8f79584f125cc0dfa111cbf85a61d4d77e4255d9097fca0734
@@ -75,8 +75,7 @@ module Kitchen
75
75
  begin
76
76
  mon = UNIXSocket.new(monitor)
77
77
  rescue Errno::ECONNREFUSED
78
- File.delete(spice_path)
79
- File.delete(monitor)
78
+ cleanup!
80
79
  else
81
80
  mon.close
82
81
  raise ActionFailed, "QEMU instance #{instance.to_str} already running."
@@ -138,7 +137,10 @@ module Kitchen
138
137
  error = err.read.strip
139
138
  end
140
139
  end
141
- raise ActionFailed, error if error
140
+ if error
141
+ cleanup!
142
+ raise ActionFailed, error
143
+ end
142
144
 
143
145
  if hostname == fqdn
144
146
  names = fqdn
@@ -179,8 +181,7 @@ module Kitchen
179
181
  raise ActionFailed, "QEMU instance #{instance.to_str} is unresponsive"
180
182
  end
181
183
 
182
- File.delete(spice_path)
183
- File.delete(monitor)
184
+ cleanup!
184
185
  end
185
186
 
186
187
  private
@@ -243,6 +244,16 @@ tY4IM9IaSC2LuPFVc0Kx6TwObdeQScOokIxL3HfayfLKieTLC+w2
243
244
  File.open(path, File::CREAT|File::TRUNC|File::RDWR, 0600) { |f| f.write(@@privkey) }
244
245
  end
245
246
 
247
+ def cleanup!
248
+ [ spice_path, monitor_path ].each do |path|
249
+ begin
250
+ File.delete(path)
251
+ rescue Errno::ENOENT
252
+ # do nothing
253
+ end
254
+ end
255
+ end
256
+
246
257
  end
247
258
  end
248
259
  end
@@ -17,6 +17,6 @@
17
17
  module Kitchen
18
18
  module Driver
19
19
  # Version string for the QEMU Kitchen driver
20
- QEMU_VERSION = '0.1.0'
20
+ QEMU_VERSION = '0.1.1'
21
21
  end
22
22
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-qemu
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Emil Renner Berthing
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-02-21 00:00:00.000000000 Z
11
+ date: 2016-02-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: test-kitchen