Juju Charms Collection
cinder package

Merge lp:~james-page/charms/trusty/cinder/unit-test-fixes into lp:~openstack-charmers-archive/charms/trusty/cinder/next

  1. Trusty Tahr (14.04)
  2. unit-test-fixes
  3. Merge into next
Proposed by James Page
Status: Merged
Merged at revision: 113
Proposed branch: lp:~james-page/charms/trusty/cinder/unit-test-fixes
Merge into: lp:~openstack-charmers-archive/charms/trusty/cinder/next
Diff against target: 280 lines (+63/-59)
1 file modified
unit_tests/test_cinder_utils.py (+63/-59)
To merge this branch: bzr merge lp:~james-page/charms/trusty/cinder/unit-test-fixes
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+266692@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7456 cinder-next for james-page mp266692
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7456/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #6916 cinder-next for james-page mp266692
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/11991809/
Build: http://10.245.162.77:8080/job/charm_unit_test/6916/

lp:~james-page/charms/trusty/cinder/unit-test-fixes updated
114. By James Page

Prefix device names in test to avoid conflicts with real device names.

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7457 cinder-next for james-page mp266692
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7457/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #6917 cinder-next for james-page mp266692
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6917/

Revision history for this message
Liam Young (gnuoy) wrote :

LGTM, thanks

review: Approve
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5583 cinder-next for james-page mp266692
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11996103/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5583/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unit_tests/test_cinder_utils.py'
2--- unit_tests/test_cinder_utils.py 2015-07-27 15:49:26 +0000
3+++ unit_tests/test_cinder_utils.py 2015-08-03 09:22:44 +0000
4@@ -55,7 +55,7 @@
5
6
7 MOUNTS = [
8- ['/mnt', '/dev/vdb']
9+ ['/mnt', '/dev/fakevbd']
10 ]
11
12 DPKG_OPTIONS = [
13@@ -64,9 +64,9 @@
14 ]
15
16 FDISKDISPLAY = """
17- Disk /dev/vdb doesn't contain a valid partition table
18+ Disk /dev/fakevbd doesn't contain a valid partition table
19
20- Disk /dev/vdb: 21.5 GB, 21474836480 bytes
21+ Disk /dev/fakevbd: 21.5 GB, 21474836480 bytes
22 16 heads, 63 sectors/track, 41610 cylinders, total 41943040 sectors
23 Units = sectors of 1 * 512 = 512 bytes
24 Sector size (logical/physical): 512 bytes / 512 bytes
25@@ -207,34 +207,34 @@
26 self.is_lvm_physical_volume.return_value = False
27 self.zap_disk.return_value = True
28 self.mounts.return_value = MOUNTS
29- cinder_utils.clean_storage('/dev/vdb')
30- self.umount.called_with('/dev/vdb', True)
31+ cinder_utils.clean_storage('/dev/fakevbd')
32+ self.umount.called_with('/dev/fakevbd', True)
33
34 def test_clean_storage_lvm_wipe(self):
35 'It removes traces of LVM when cleaning storage'
36 self.mounts.return_value = []
37 self.is_lvm_physical_volume.return_value = True
38- cinder_utils.clean_storage('/dev/vdb')
39- self.remove_lvm_physical_volume.assert_called_with('/dev/vdb')
40- self.deactivate_lvm_volume_group.assert_called_with('/dev/vdb')
41- self.zap_disk.assert_called_with('/dev/vdb')
42+ cinder_utils.clean_storage('/dev/fakevbd')
43+ self.remove_lvm_physical_volume.assert_called_with('/dev/fakevbd')
44+ self.deactivate_lvm_volume_group.assert_called_with('/dev/fakevbd')
45+ self.zap_disk.assert_called_with('/dev/fakevbd')
46
47 def test_clean_storage_zap_disk(self):
48 'It removes traces of LVM when cleaning storage'
49 self.mounts.return_value = []
50 self.is_lvm_physical_volume.return_value = False
51- cinder_utils.clean_storage('/dev/vdb')
52- self.zap_disk.assert_called_with('/dev/vdb')
53+ cinder_utils.clean_storage('/dev/fakevbd')
54+ self.zap_disk.assert_called_with('/dev/fakevbd')
55
56 def test_parse_block_device(self):
57 self.assertTrue(cinder_utils._parse_block_device(None),
58 (None, 0))
59- self.assertTrue(cinder_utils._parse_block_device('vdc'),
60- ('/dev/vdc', 0))
61- self.assertTrue(cinder_utils._parse_block_device('/dev/vdc'),
62- ('/dev/vdc', 0))
63- self.assertTrue(cinder_utils._parse_block_device('/dev/vdc'),
64- ('/dev/vdc', 0))
65+ self.assertTrue(cinder_utils._parse_block_device('fakevdc'),
66+ ('/dev/fakevdc', 0))
67+ self.assertTrue(cinder_utils._parse_block_device('/dev/fakevdc'),
68+ ('/dev/fakevdc', 0))
69+ self.assertTrue(cinder_utils._parse_block_device('/dev/fakevdc'),
70+ ('/dev/fakevdc', 0))
71 self.assertTrue(cinder_utils._parse_block_device('/mnt/loop0|10'),
72 ('/mnt/loop0', 10))
73 self.assertTrue(cinder_utils._parse_block_device('/mnt/loop0'),
74@@ -243,9 +243,9 @@
75 @patch('subprocess.check_output')
76 def test_has_partition_table(self, _check):
77 _check.return_value = FDISKDISPLAY
78- block_device = '/dev/vdb'
79+ block_device = '/dev/fakevbd'
80 cinder_utils.has_partition_table(block_device)
81- _check.assert_called_with(['fdisk', '-l', '/dev/vdb'], stderr=-2)
82+ _check.assert_called_with(['fdisk', '-l', '/dev/fakevbd'], stderr=-2)
83
84 @patch('cinder_utils.log_lvm_info', Mock())
85 @patch.object(cinder_utils, 'ensure_lvm_volume_group_non_existent')
86@@ -254,20 +254,20 @@
87 @patch.object(cinder_utils, 'extend_lvm_volume_group')
88 def test_configure_lvm_storage(self, extend_lvm, reduce_lvm,
89 clean_storage, ensure_non_existent):
90- devices = ['/dev/vdb', '/dev/vdc']
91+ devices = ['/dev/fakevbd', '/dev/fakevdc']
92 self.is_lvm_physical_volume.return_value = False
93 cinder_utils.configure_lvm_storage(devices, 'test', True, True)
94 clean_storage.assert_has_calls(
95- [call('/dev/vdb'),
96- call('/dev/vdc')]
97+ [call('/dev/fakevbd'),
98+ call('/dev/fakevdc')]
99 )
100 self.create_lvm_physical_volume.assert_has_calls(
101- [call('/dev/vdb'),
102- call('/dev/vdc')]
103+ [call('/dev/fakevbd'),
104+ call('/dev/fakevdc')]
105 )
106- self.create_lvm_volume_group.assert_called_with('test', '/dev/vdb')
107+ self.create_lvm_volume_group.assert_called_with('test', '/dev/fakevbd')
108 reduce_lvm.assert_called_with('test')
109- extend_lvm.assert_called_with('test', '/dev/vdc')
110+ extend_lvm.assert_called_with('test', '/dev/fakevdc')
111 ensure_non_existent.assert_called_with('test')
112
113 @patch('cinder_utils.log_lvm_info', Mock())
114@@ -277,27 +277,27 @@
115 @patch.object(cinder_utils, 'extend_lvm_volume_group')
116 def test_configure_lvm_storage_unused_dev(self, extend_lvm, reduce_lvm,
117 clean_storage, has_part):
118- devices = ['/dev/vdb', '/dev/vdc']
119+ devices = ['/dev/fakevbd', '/dev/fakevdc']
120 self.is_lvm_physical_volume.return_value = False
121 has_part.return_value = False
122 cinder_utils.configure_lvm_storage(devices, 'test', False, True)
123 clean_storage.assert_has_calls(
124- [call('/dev/vdb'),
125- call('/dev/vdc')]
126+ [call('/dev/fakevbd'),
127+ call('/dev/fakevdc')]
128 )
129 self.create_lvm_physical_volume.assert_has_calls(
130- [call('/dev/vdb'),
131- call('/dev/vdc')]
132+ [call('/dev/fakevbd'),
133+ call('/dev/fakevdc')]
134 )
135- self.create_lvm_volume_group.assert_called_with('test', '/dev/vdb')
136+ self.create_lvm_volume_group.assert_called_with('test', '/dev/fakevbd')
137 reduce_lvm.assert_called_with('test')
138- extend_lvm.assert_called_with('test', '/dev/vdc')
139+ extend_lvm.assert_called_with('test', '/dev/fakevdc')
140
141 @patch('cinder_utils.log_lvm_info', Mock())
142 @patch.object(cinder_utils, 'has_partition_table')
143 @patch.object(cinder_utils, 'reduce_lvm_volume_group_missing')
144 def test_configure_lvm_storage_used_dev(self, reduce_lvm, has_part):
145- devices = ['/dev/vdb', '/dev/vdc']
146+ devices = ['/dev/fakevbd', '/dev/fakevdc']
147 self.is_lvm_physical_volume.return_value = False
148 has_part.return_value = True
149 cinder_utils.configure_lvm_storage(devices, 'test', False, True)
150@@ -323,66 +323,70 @@
151 self.assertFalse(extend_lvm.called)
152 ensure_non_existent.assert_called_with('test')
153
154+ @patch.object(cinder_utils, 'lvm_volume_group_exists')
155 @patch('cinder_utils.log_lvm_info', Mock())
156 @patch.object(cinder_utils, 'clean_storage')
157 @patch.object(cinder_utils, 'reduce_lvm_volume_group_missing')
158 @patch.object(cinder_utils, 'extend_lvm_volume_group')
159 def test_configure_lvm_storage_existing_vg(self, extend_lvm, reduce_lvm,
160- clean_storage):
161+ clean_storage, lvm_exists):
162 def pv_lookup(device):
163 devices = {
164- '/dev/vdb': True,
165- '/dev/vdc': False
166+ '/dev/fakevbd': True,
167+ '/dev/fakevdc': False
168 }
169 return devices[device]
170
171 def vg_lookup(device):
172 devices = {
173- '/dev/vdb': 'test',
174- '/dev/vdc': None
175+ '/dev/fakevbd': 'test',
176+ '/dev/fakevdc': None
177 }
178 return devices[device]
179- devices = ['/dev/vdb', '/dev/vdc']
180+ devices = ['/dev/fakevbd', '/dev/fakevdc']
181+ lvm_exists.return_value = False
182 self.is_lvm_physical_volume.side_effect = pv_lookup
183 self.list_lvm_volume_group.side_effect = vg_lookup
184 cinder_utils.configure_lvm_storage(devices, 'test', True, True)
185 clean_storage.assert_has_calls(
186- [call('/dev/vdc')]
187+ [call('/dev/fakevdc')]
188 )
189 self.create_lvm_physical_volume.assert_has_calls(
190- [call('/dev/vdc')]
191+ [call('/dev/fakevdc')]
192 )
193 reduce_lvm.assert_called_with('test')
194- extend_lvm.assert_called_with('test', '/dev/vdc')
195+ extend_lvm.assert_called_with('test', '/dev/fakevdc')
196 self.assertFalse(self.create_lvm_volume_group.called)
197
198+ @patch.object(cinder_utils, 'lvm_volume_group_exists')
199 @patch('cinder_utils.log_lvm_info', Mock())
200 @patch.object(cinder_utils, 'clean_storage')
201 @patch.object(cinder_utils, 'reduce_lvm_volume_group_missing')
202 @patch.object(cinder_utils, 'extend_lvm_volume_group')
203 def test_configure_lvm_storage_different_vg(self, extend_lvm, reduce_lvm,
204- clean_storage):
205+ clean_storage, lvm_exists):
206 def pv_lookup(device):
207 devices = {
208- '/dev/vdb': True,
209- '/dev/vdc': True
210+ '/dev/fakevbd': True,
211+ '/dev/fakevdc': True
212 }
213 return devices[device]
214
215 def vg_lookup(device):
216 devices = {
217- '/dev/vdb': 'test',
218- '/dev/vdc': 'another'
219+ '/dev/fakevbd': 'test',
220+ '/dev/fakevdc': 'another'
221 }
222 return devices[device]
223- devices = ['/dev/vdb', '/dev/vdc']
224+ devices = ['/dev/fakevbd', '/dev/fakevdc']
225 self.is_lvm_physical_volume.side_effect = pv_lookup
226 self.list_lvm_volume_group.side_effect = vg_lookup
227+ lvm_exists.return_value = False
228 cinder_utils.configure_lvm_storage(devices, 'test', True, True)
229- clean_storage.assert_called_with('/dev/vdc')
230- self.create_lvm_physical_volume.assert_called_with('/dev/vdc')
231+ clean_storage.assert_called_with('/dev/fakevdc')
232+ self.create_lvm_physical_volume.assert_called_with('/dev/fakevdc')
233 reduce_lvm.assert_called_with('test')
234- extend_lvm.assert_called_with('test', '/dev/vdc')
235+ extend_lvm.assert_called_with('test', '/dev/fakevdc')
236 self.assertFalse(self.create_lvm_volume_group.called)
237
238 @patch('cinder_utils.log_lvm_info', Mock())
239@@ -394,18 +398,18 @@
240 clean_storage):
241 def pv_lookup(device):
242 devices = {
243- '/dev/vdb': True,
244- '/dev/vdc': True
245+ '/dev/fakevbd': True,
246+ '/dev/fakevdc': True
247 }
248 return devices[device]
249
250 def vg_lookup(device):
251 devices = {
252- '/dev/vdb': 'test',
253- '/dev/vdc': 'another'
254+ '/dev/fakevbd': 'test',
255+ '/dev/fakevdc': 'another'
256 }
257 return devices[device]
258- devices = ['/dev/vdb', '/dev/vdc']
259+ devices = ['/dev/fakevbd', '/dev/fakevdc']
260 self.is_lvm_physical_volume.side_effect = pv_lookup
261 self.list_lvm_volume_group.side_effect = vg_lookup
262 cinder_utils.configure_lvm_storage(devices, 'test', False, False)
263@@ -419,7 +423,7 @@
264 @patch.object(cinder_utils, 'reduce_lvm_volume_group_missing')
265 def test_configure_lvm_storage_unforced_remove_default(self, reduce_lvm):
266 """It doesn't force remove missing by default."""
267- devices = ['/dev/vdb']
268+ devices = ['/dev/fakevbd']
269 cinder_utils.configure_lvm_storage(devices, 'test', False, True)
270 reduce_lvm.assert_called_with('test')
271
272@@ -427,7 +431,7 @@
273 @patch.object(cinder_utils, 'reduce_lvm_volume_group_missing')
274 def test_configure_lvm_storage_force_removemissing(self, reduce_lvm):
275 """It forces remove missing when asked to."""
276- devices = ['/dev/vdb']
277+ devices = ['/dev/fakevbd']
278 cinder_utils.configure_lvm_storage(
279 devices, 'test', False, True, remove_missing_force=True)
280 reduce_lvm.assert_called_with('test', extra_args=['--force'])

Subscribers

People subscribed via source and target branches