Skip to content

Commit e1c5325

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Refactor TestVolumeList with FakeVolume"
2 parents 56680c8 + 553e154 commit e1c5325

2 files changed

Lines changed: 63 additions & 64 deletions

File tree

‎openstackclient/tests/volume/v2/fakes.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,8 @@ def create_one_volume(attrs=None):
391391
'size': random.randint(1, 20),
392392
'volume_type':
393393
random.choice(['fake_lvmdriver-1', 'fake_lvmdriver-2']),
394+
'bootable':
395+
random.randint(0, 1),
394396
'metadata': {
395397
'key' + uuid.uuid4().hex: 'val' + uuid.uuid4().hex,
396398
'key' + uuid.uuid4().hex: 'val' + uuid.uuid4().hex,

‎openstackclient/tests/volume/v2/test_volume.py‎

Lines changed: 61 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ class TestVolumeCreate(TestVolume):
5858
columns = (
5959
'attachments',
6060
'availability_zone',
61+
'bootable',
6162
'description',
6263
'id',
6364
'name',
@@ -77,6 +78,7 @@ def setUp(self):
7778
self.datalist = (
7879
self.new_volume.attachments,
7980
self.new_volume.availability_zone,
81+
self.new_volume.bootable,
8082
self.new_volume.description,
8183
self.new_volume.id,
8284
self.new_volume.name,
@@ -475,13 +477,8 @@ class TestVolumeList(TestVolume):
475477
def setUp(self):
476478
super(TestVolumeList, self).setUp()
477479

478-
self.volumes_mock.list.return_value = [
479-
fakes.FakeResource(
480-
None,
481-
copy.deepcopy(volume_fakes.VOLUME),
482-
loaded=True,
483-
),
484-
]
480+
self.mock_volume = volume_fakes.FakeVolume.create_one_volume()
481+
self.volumes_mock.list.return_value = [self.mock_volume]
485482

486483
self.users_mock.get.return_value = [
487484
fakes.FakeResource(
@@ -516,14 +513,14 @@ def test_volume_list_no_options(self):
516513

517514
self.assertEqual(self.columns, columns)
518515

519-
server = volume_fakes.volume_attachment_server['server_id']
520-
device = volume_fakes.volume_attachment_server['device']
516+
server = self.mock_volume.attachments[0]['server_id']
517+
device = self.mock_volume.attachments[0]['device']
521518
msg = 'Attached to %s on %s ' % (server, device)
522519
datalist = ((
523-
volume_fakes.volume_id,
524-
volume_fakes.volume_name,
525-
volume_fakes.volume_status,
526-
volume_fakes.volume_size,
520+
self.mock_volume.id,
521+
self.mock_volume.name,
522+
self.mock_volume.status,
523+
self.mock_volume.size,
527524
msg,
528525
), )
529526
self.assertEqual(datalist, tuple(data))
@@ -544,14 +541,14 @@ def test_volume_list_project(self):
544541

545542
self.assertEqual(self.columns, columns)
546543

547-
server = volume_fakes.volume_attachment_server['server_id']
548-
device = volume_fakes.volume_attachment_server['device']
544+
server = self.mock_volume.attachments[0]['server_id']
545+
device = self.mock_volume.attachments[0]['device']
549546
msg = 'Attached to %s on %s ' % (server, device)
550547
datalist = ((
551-
volume_fakes.volume_id,
552-
volume_fakes.volume_name,
553-
volume_fakes.volume_status,
554-
volume_fakes.volume_size,
548+
self.mock_volume.id,
549+
self.mock_volume.name,
550+
self.mock_volume.status,
551+
self.mock_volume.size,
555552
msg,
556553
), )
557554
self.assertEqual(datalist, tuple(data))
@@ -574,14 +571,14 @@ def test_volume_list_project_domain(self):
574571

575572
self.assertEqual(self.columns, columns)
576573

577-
server = volume_fakes.volume_attachment_server['server_id']
578-
device = volume_fakes.volume_attachment_server['device']
574+
server = self.mock_volume.attachments[0]['server_id']
575+
device = self.mock_volume.attachments[0]['device']
579576
msg = 'Attached to %s on %s ' % (server, device)
580577
datalist = ((
581-
volume_fakes.volume_id,
582-
volume_fakes.volume_name,
583-
volume_fakes.volume_status,
584-
volume_fakes.volume_size,
578+
self.mock_volume.id,
579+
self.mock_volume.name,
580+
self.mock_volume.status,
581+
self.mock_volume.size,
585582
msg,
586583
), )
587584
self.assertEqual(datalist, tuple(data))
@@ -601,14 +598,14 @@ def test_volume_list_user(self):
601598
columns, data = self.cmd.take_action(parsed_args)
602599

603600
self.assertEqual(self.columns, columns)
604-
server = volume_fakes.volume_attachment_server['server_id']
605-
device = volume_fakes.volume_attachment_server['device']
601+
server = self.mock_volume.attachments[0]['server_id']
602+
device = self.mock_volume.attachments[0]['device']
606603
msg = 'Attached to %s on %s ' % (server, device)
607604
datalist = ((
608-
volume_fakes.volume_id,
609-
volume_fakes.volume_name,
610-
volume_fakes.volume_status,
611-
volume_fakes.volume_size,
605+
self.mock_volume.id,
606+
self.mock_volume.name,
607+
self.mock_volume.status,
608+
self.mock_volume.size,
612609
msg,
613610
), )
614611
self.assertEqual(datalist, tuple(data))
@@ -631,14 +628,14 @@ def test_volume_list_user_domain(self):
631628

632629
self.assertEqual(self.columns, columns)
633630

634-
server = volume_fakes.volume_attachment_server['server_id']
635-
device = volume_fakes.volume_attachment_server['device']
631+
server = self.mock_volume.attachments[0]['server_id']
632+
device = self.mock_volume.attachments[0]['device']
636633
msg = 'Attached to %s on %s ' % (server, device)
637634
datalist = ((
638-
volume_fakes.volume_id,
639-
volume_fakes.volume_name,
640-
volume_fakes.volume_status,
641-
volume_fakes.volume_size,
635+
self.mock_volume.id,
636+
self.mock_volume.name,
637+
self.mock_volume.status,
638+
self.mock_volume.size,
642639
msg,
643640
), )
644641
self.assertEqual(datalist, tuple(data))
@@ -659,14 +656,14 @@ def test_volume_list_name(self):
659656

660657
self.assertEqual(self.columns, columns)
661658

662-
server = volume_fakes.volume_attachment_server['server_id']
663-
device = volume_fakes.volume_attachment_server['device']
659+
server = self.mock_volume.attachments[0]['server_id']
660+
device = self.mock_volume.attachments[0]['device']
664661
msg = 'Attached to %s on %s ' % (server, device)
665662
datalist = ((
666-
volume_fakes.volume_id,
667-
volume_fakes.volume_name,
668-
volume_fakes.volume_status,
669-
volume_fakes.volume_size,
663+
self.mock_volume.id,
664+
self.mock_volume.name,
665+
self.mock_volume.status,
666+
self.mock_volume.size,
670667
msg,
671668
), )
672669
self.assertEqual(datalist, tuple(data))
@@ -687,14 +684,14 @@ def test_volume_list_status(self):
687684

688685
self.assertEqual(self.columns, columns)
689686

690-
server = volume_fakes.volume_attachment_server['server_id']
691-
device = volume_fakes.volume_attachment_server['device']
687+
server = self.mock_volume.attachments[0]['server_id']
688+
device = self.mock_volume.attachments[0]['device']
692689
msg = 'Attached to %s on %s ' % (server, device)
693690
datalist = ((
694-
volume_fakes.volume_id,
695-
volume_fakes.volume_name,
696-
volume_fakes.volume_status,
697-
volume_fakes.volume_size,
691+
self.mock_volume.id,
692+
self.mock_volume.name,
693+
self.mock_volume.status,
694+
self.mock_volume.size,
698695
msg,
699696
), )
700697
self.assertEqual(datalist, tuple(data))
@@ -715,14 +712,14 @@ def test_volume_list_all_projects(self):
715712

716713
self.assertEqual(self.columns, columns)
717714

718-
server = volume_fakes.volume_attachment_server['server_id']
719-
device = volume_fakes.volume_attachment_server['device']
715+
server = self.mock_volume.attachments[0]['server_id']
716+
device = self.mock_volume.attachments[0]['device']
720717
msg = 'Attached to %s on %s ' % (server, device)
721718
datalist = ((
722-
volume_fakes.volume_id,
723-
volume_fakes.volume_name,
724-
volume_fakes.volume_status,
725-
volume_fakes.volume_size,
719+
self.mock_volume.id,
720+
self.mock_volume.name,
721+
self.mock_volume.status,
722+
self.mock_volume.size,
726723
msg,
727724
), )
728725
self.assertEqual(datalist, tuple(data))
@@ -754,18 +751,18 @@ def test_volume_list_long(self):
754751
]
755752
self.assertEqual(collist, columns)
756753

757-
server = volume_fakes.volume_attachment_server['server_id']
758-
device = volume_fakes.volume_attachment_server['device']
754+
server = self.mock_volume.attachments[0]['server_id']
755+
device = self.mock_volume.attachments[0]['device']
759756
msg = 'Attached to %s on %s ' % (server, device)
760757
datalist = ((
761-
volume_fakes.volume_id,
762-
volume_fakes.volume_name,
763-
volume_fakes.volume_status,
764-
volume_fakes.volume_size,
765-
volume_fakes.volume_type,
766-
'',
758+
self.mock_volume.id,
759+
self.mock_volume.name,
760+
self.mock_volume.status,
761+
self.mock_volume.size,
762+
self.mock_volume.volume_type,
763+
self.mock_volume.bootable,
767764
msg,
768-
"Alpha='a', Beta='b', Gamma='g'",
765+
utils.format_dict(self.mock_volume.metadata),
769766
), )
770767
self.assertEqual(datalist, tuple(data))
771768

0 commit comments

Comments
 (0)