Skip to content

Commit 7b2ff8e

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Refactor abstract columns and datalist out in image and object test cases"
2 parents ee78fb2 + 69b8cde commit 7b2ff8e

6 files changed

Lines changed: 106 additions & 171 deletions

File tree

‎openstackclient/tests/image/v1/test_image.py‎

Lines changed: 23 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,19 @@ def test_image_delete_no_options(self):
240240

241241
class TestImageList(TestImage):
242242

243+
columns = (
244+
'ID',
245+
'Name',
246+
'Status',
247+
)
248+
datalist = (
249+
(
250+
image_fakes.image_id,
251+
image_fakes.image_name,
252+
'',
253+
),
254+
)
255+
243256
def setUp(self):
244257
super(TestImageList, self).setUp()
245258

@@ -268,15 +281,8 @@ def test_image_list_no_options(self):
268281
marker=image_fakes.image_id,
269282
)
270283

271-
collist = ('ID', 'Name', 'Status')
272-
273-
self.assertEqual(collist, columns)
274-
datalist = ((
275-
image_fakes.image_id,
276-
image_fakes.image_name,
277-
'',
278-
), )
279-
self.assertEqual(datalist, tuple(data))
284+
self.assertEqual(self.columns, columns)
285+
self.assertEqual(self.datalist, tuple(data))
280286

281287
def test_image_list_public_option(self):
282288
arglist = [
@@ -297,15 +303,8 @@ def test_image_list_public_option(self):
297303
marker=image_fakes.image_id,
298304
)
299305

300-
collist = ('ID', 'Name', 'Status')
301-
302-
self.assertEqual(collist, columns)
303-
datalist = ((
304-
image_fakes.image_id,
305-
image_fakes.image_name,
306-
'',
307-
), )
308-
self.assertEqual(datalist, tuple(data))
306+
self.assertEqual(self.columns, columns)
307+
self.assertEqual(self.datalist, tuple(data))
309308

310309
def test_image_list_private_option(self):
311310
arglist = [
@@ -326,15 +325,8 @@ def test_image_list_private_option(self):
326325
marker=image_fakes.image_id,
327326
)
328327

329-
collist = ('ID', 'Name', 'Status')
330-
331-
self.assertEqual(collist, columns)
332-
datalist = ((
333-
image_fakes.image_id,
334-
image_fakes.image_name,
335-
'',
336-
), )
337-
self.assertEqual(datalist, tuple(data))
328+
self.assertEqual(self.columns, columns)
329+
self.assertEqual(self.datalist, tuple(data))
338330

339331
def test_image_list_long_option(self):
340332
arglist = [
@@ -407,15 +399,8 @@ def test_image_list_property_option(self, sf_mock):
407399
property_field='properties',
408400
)
409401

410-
collist = ('ID', 'Name', 'Status')
411-
412-
self.assertEqual(columns, collist)
413-
datalist = ((
414-
image_fakes.image_id,
415-
image_fakes.image_name,
416-
'',
417-
), )
418-
self.assertEqual(datalist, tuple(data))
402+
self.assertEqual(self.columns, columns)
403+
self.assertEqual(self.datalist, tuple(data))
419404

420405
@mock.patch('openstackclient.common.utils.sort_items')
421406
def test_image_list_sort_option(self, si_mock):
@@ -438,15 +423,8 @@ def test_image_list_sort_option(self, si_mock):
438423
'name:asc'
439424
)
440425

441-
collist = ('ID', 'Name', 'Status')
442-
443-
self.assertEqual(collist, columns)
444-
datalist = ((
445-
image_fakes.image_id,
446-
image_fakes.image_name,
447-
'',
448-
), )
449-
self.assertEqual(datalist, tuple(data))
426+
self.assertEqual(self.columns, columns)
427+
self.assertEqual(self.datalist, tuple(data))
450428

451429

452430
class TestImageSet(TestImage):

‎openstackclient/tests/image/v2/test_image.py‎

Lines changed: 40 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,17 @@ def test_image_create_dead_options(self):
333333

334334
class TestAddProjectToImage(TestImage):
335335

336+
columns = (
337+
'image_id',
338+
'member_id',
339+
'status',
340+
)
341+
datalist = (
342+
image_fakes.image_id,
343+
identity_fakes.project_id,
344+
image_fakes.member_status,
345+
)
346+
336347
def setUp(self):
337348
super(TestAddProjectToImage, self).setUp()
338349

@@ -375,14 +386,8 @@ def test_add_project_to_image_no_option(self):
375386
image_fakes.image_id,
376387
identity_fakes.project_id
377388
)
378-
collist = ('image_id', 'member_id', 'status')
379-
self.assertEqual(collist, columns)
380-
datalist = (
381-
image_fakes.image_id,
382-
identity_fakes.project_id,
383-
image_fakes.member_status
384-
)
385-
self.assertEqual(datalist, data)
389+
self.assertEqual(self.columns, columns)
390+
self.assertEqual(self.datalist, data)
386391

387392
def test_add_project_to_image_with_option(self):
388393
arglist = [
@@ -403,14 +408,8 @@ def test_add_project_to_image_with_option(self):
403408
image_fakes.image_id,
404409
identity_fakes.project_id
405410
)
406-
collist = ('image_id', 'member_id', 'status')
407-
self.assertEqual(collist, columns)
408-
datalist = (
409-
image_fakes.image_id,
410-
identity_fakes.project_id,
411-
image_fakes.member_status
412-
)
413-
self.assertEqual(datalist, data)
411+
self.assertEqual(self.columns, columns)
412+
self.assertEqual(self.datalist, data)
414413

415414

416415
class TestImageDelete(TestImage):
@@ -460,6 +459,19 @@ def test_image_delete_multi_images(self):
460459

461460
class TestImageList(TestImage):
462461

462+
columns = (
463+
'ID',
464+
'Name',
465+
'Status',
466+
)
467+
datalist = (
468+
(
469+
image_fakes.image_id,
470+
image_fakes.image_name,
471+
'',
472+
),
473+
)
474+
463475
def setUp(self):
464476
super(TestImageList, self).setUp()
465477

@@ -488,15 +500,8 @@ def test_image_list_no_options(self):
488500
marker=image_fakes.image_id,
489501
)
490502

491-
collist = ('ID', 'Name', 'Status')
492-
493-
self.assertEqual(collist, columns)
494-
datalist = ((
495-
image_fakes.image_id,
496-
image_fakes.image_name,
497-
'',
498-
), )
499-
self.assertEqual(datalist, tuple(data))
503+
self.assertEqual(self.columns, columns)
504+
self.assertEqual(self.datalist, tuple(data))
500505

501506
def test_image_list_public_option(self):
502507
arglist = [
@@ -517,15 +522,8 @@ def test_image_list_public_option(self):
517522
marker=image_fakes.image_id,
518523
)
519524

520-
collist = ('ID', 'Name', 'Status')
521-
522-
self.assertEqual(collist, columns)
523-
datalist = ((
524-
image_fakes.image_id,
525-
image_fakes.image_name,
526-
'',
527-
), )
528-
self.assertEqual(datalist, tuple(data))
525+
self.assertEqual(self.columns, columns)
526+
self.assertEqual(self.datalist, tuple(data))
529527

530528
def test_image_list_private_option(self):
531529
arglist = [
@@ -546,15 +544,8 @@ def test_image_list_private_option(self):
546544
marker=image_fakes.image_id,
547545
)
548546

549-
collist = ('ID', 'Name', 'Status')
550-
551-
self.assertEqual(collist, columns)
552-
datalist = ((
553-
image_fakes.image_id,
554-
image_fakes.image_name,
555-
'',
556-
), )
557-
self.assertEqual(datalist, tuple(data))
547+
self.assertEqual(self.columns, columns)
548+
self.assertEqual(self.datalist, tuple(data))
558549

559550
def test_image_list_shared_option(self):
560551
arglist = [
@@ -575,15 +566,8 @@ def test_image_list_shared_option(self):
575566
marker=image_fakes.image_id,
576567
)
577568

578-
collist = ('ID', 'Name', 'Status')
579-
580-
self.assertEqual(columns, collist)
581-
datalist = ((
582-
image_fakes.image_id,
583-
image_fakes.image_name,
584-
'',
585-
), )
586-
self.assertEqual(datalist, tuple(data))
569+
self.assertEqual(self.columns, columns)
570+
self.assertEqual(self.datalist, tuple(data))
587571

588572
def test_image_list_long_option(self):
589573
arglist = [
@@ -654,15 +638,8 @@ def test_image_list_property_option(self, sf_mock):
654638
property_field='properties',
655639
)
656640

657-
collist = ('ID', 'Name', 'Status')
658-
659-
self.assertEqual(columns, collist)
660-
datalist = ((
661-
image_fakes.image_id,
662-
image_fakes.image_name,
663-
'',
664-
), )
665-
self.assertEqual(datalist, tuple(data))
641+
self.assertEqual(self.columns, columns)
642+
self.assertEqual(self.datalist, tuple(data))
666643

667644
@mock.patch('openstackclient.common.utils.sort_items')
668645
def test_image_list_sort_option(self, si_mock):
@@ -684,15 +661,8 @@ def test_image_list_sort_option(self, si_mock):
684661
'name:asc'
685662
)
686663

687-
collist = ('ID', 'Name', 'Status')
688-
689-
self.assertEqual(collist, columns)
690-
datalist = ((
691-
image_fakes.image_id,
692-
image_fakes.image_name,
693-
'',
694-
), )
695-
self.assertEqual(datalist, tuple(data))
664+
self.assertEqual(self.columns, columns)
665+
self.assertEqual(self.datalist, tuple(data))
696666

697667

698668
class TestRemoveProjectImage(TestImage):

‎openstackclient/tests/object/v1/test_container.py‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ def __init__(self, endpoint=None, **kwargs):
3232

3333

3434
class TestContainer(object_fakes.TestObjectv1):
35+
36+
columns = ('Name',)
37+
3538
def setUp(self):
3639
super(TestContainer, self).setUp()
3740
self.app.client_manager.object_store = object_store.APIv1(
@@ -73,8 +76,7 @@ def test_object_list_containers_no_options(self, c_mock):
7376
**kwargs
7477
)
7578

76-
collist = ('Name',)
77-
self.assertEqual(collist, columns)
79+
self.assertEqual(self.columns, columns)
7880
datalist = (
7981
(object_fakes.container_name, ),
8082
(object_fakes.container_name_3, ),
@@ -107,8 +109,7 @@ def test_object_list_containers_prefix(self, c_mock):
107109
**kwargs
108110
)
109111

110-
collist = ('Name',)
111-
self.assertEqual(collist, columns)
112+
self.assertEqual(self.columns, columns)
112113
datalist = (
113114
(object_fakes.container_name, ),
114115
(object_fakes.container_name_3, ),
@@ -143,8 +144,7 @@ def test_object_list_containers_marker(self, c_mock):
143144
**kwargs
144145
)
145146

146-
collist = ('Name',)
147-
self.assertEqual(collist, columns)
147+
self.assertEqual(self.columns, columns)
148148
datalist = (
149149
(object_fakes.container_name, ),
150150
(object_fakes.container_name_3, ),
@@ -176,8 +176,7 @@ def test_object_list_containers_limit(self, c_mock):
176176
**kwargs
177177
)
178178

179-
collist = ('Name',)
180-
self.assertEqual(collist, columns)
179+
self.assertEqual(self.columns, columns)
181180
datalist = (
182181
(object_fakes.container_name, ),
183182
(object_fakes.container_name_3, ),
@@ -250,8 +249,7 @@ def test_object_list_containers_all(self, c_mock):
250249
**kwargs
251250
)
252251

253-
collist = ('Name',)
254-
self.assertEqual(collist, columns)
252+
self.assertEqual(self.columns, columns)
255253
datalist = (
256254
(object_fakes.container_name, ),
257255
(object_fakes.container_name_2, ),

0 commit comments

Comments
 (0)