Skip to content

Commit 7a667d7

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Use identity fake classes instead of old unit tests data"
2 parents 0181709 + 1b2ea91 commit 7a667d7

5 files changed

Lines changed: 136 additions & 215 deletions

File tree

‎openstackclient/tests/compute/v2/test_flavor.py‎

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# under the License.
1414
#
1515

16-
import copy
1716
import mock
1817
from mock import call
1918

@@ -22,7 +21,6 @@
2221

2322
from openstackclient.compute.v2 import flavor
2423
from openstackclient.tests.compute.v2 import fakes as compute_fakes
25-
from openstackclient.tests import fakes
2624
from openstackclient.tests.identity.v3 import fakes as identity_fakes
2725
from openstackclient.tests import utils as tests_utils
2826

@@ -48,7 +46,7 @@ class TestFlavorCreate(TestFlavor):
4846

4947
flavor = compute_fakes.FakeFlavor.create_one_flavor(
5048
attrs={'links': 'flavor-links'})
51-
49+
project = identity_fakes.FakeProject.create_one_project()
5250
columns = (
5351
'OS-FLV-DISABLED:disabled',
5452
'OS-FLV-EXT-DATA:ephemeral',
@@ -80,11 +78,7 @@ def setUp(self):
8078
super(TestFlavorCreate, self).setUp()
8179

8280
# Return a project
83-
self.projects_mock.get.return_value = fakes.FakeResource(
84-
None,
85-
copy.deepcopy(identity_fakes.PROJECT),
86-
loaded=True,
87-
)
81+
self.projects_mock.get.return_value = self.project
8882
self.flavors_mock.create.return_value = self.flavor
8983
self.cmd = flavor.CreateFlavor(self.app, None)
9084

@@ -174,7 +168,7 @@ def test_flavor_create_other_options(self):
174168
'--vcpus', str(self.flavor.vcpus),
175169
'--rxtx-factor', str(self.flavor.rxtx_factor),
176170
'--private',
177-
'--project', identity_fakes.project_id,
171+
'--project', self.project.id,
178172
'--property', 'key1=value1',
179173
'--property', 'key2=value2',
180174
self.flavor.name,
@@ -188,7 +182,7 @@ def test_flavor_create_other_options(self):
188182
('vcpus', self.flavor.vcpus),
189183
('rxtx_factor', self.flavor.rxtx_factor),
190184
('public', False),
191-
('project', identity_fakes.project_id),
185+
('project', self.project.id),
192186
('property', {'key1': 'value1', 'key2': 'value2'}),
193187
('name', self.flavor.name),
194188
]
@@ -209,7 +203,7 @@ def test_flavor_create_other_options(self):
209203
self.flavors_mock.create.assert_called_once_with(*args)
210204
self.flavor_access_mock.add_tenant_access.assert_called_with(
211205
self.flavor.id,
212-
identity_fakes.project_id,
206+
self.project.id,
213207
)
214208
self.flavor.set_keys.assert_called_with(
215209
{'key1': 'value1', 'key2': 'value2'})
@@ -219,11 +213,11 @@ def test_flavor_create_other_options(self):
219213

220214
def test_public_flavor_create_with_project(self):
221215
arglist = [
222-
'--project', identity_fakes.project_id,
216+
'--project', self.project.id,
223217
self.flavor.name,
224218
]
225219
verifylist = [
226-
('project', identity_fakes.project_id),
220+
('project', self.project.id),
227221
('name', self.flavor.name),
228222
]
229223
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -507,18 +501,15 @@ class TestFlavorSet(TestFlavor):
507501
# Return value of self.flavors_mock.find().
508502
flavor = compute_fakes.FakeFlavor.create_one_flavor(
509503
attrs={'os-flavor-access:is_public': False})
504+
project = identity_fakes.FakeProject.create_one_project()
510505

511506
def setUp(self):
512507
super(TestFlavorSet, self).setUp()
513508

514509
self.flavors_mock.find.return_value = self.flavor
515510
self.flavors_mock.get.side_effect = exceptions.NotFound(None)
516511
# Return a project
517-
self.projects_mock.get.return_value = fakes.FakeResource(
518-
None,
519-
copy.deepcopy(identity_fakes.PROJECT),
520-
loaded=True,
521-
)
512+
self.projects_mock.get.return_value = self.project
522513
self.cmd = flavor.SetFlavor(self.app, None)
523514

524515
def test_flavor_set_property(self):
@@ -540,11 +531,11 @@ def test_flavor_set_property(self):
540531

541532
def test_flavor_set_project(self):
542533
arglist = [
543-
'--project', identity_fakes.project_id,
534+
'--project', self.project.id,
544535
self.flavor.id,
545536
]
546537
verifylist = [
547-
('project', identity_fakes.project_id),
538+
('project', self.project.id),
548539
('flavor', self.flavor.id),
549540
]
550541
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -555,7 +546,7 @@ def test_flavor_set_project(self):
555546
is_public=None)
556547
self.flavor_access_mock.add_tenant_access.assert_called_with(
557548
self.flavor.id,
558-
identity_fakes.project_id,
549+
self.project.id,
559550
)
560551
self.flavor.set_keys.assert_not_called()
561552
self.assertIsNone(result)
@@ -574,10 +565,10 @@ def test_flavor_set_no_project(self):
574565

575566
def test_flavor_set_no_flavor(self):
576567
arglist = [
577-
'--project', identity_fakes.project_id,
568+
'--project', self.project.id,
578569
]
579570
verifylist = [
580-
('project', identity_fakes.project_id),
571+
('project', self.project.id),
581572
]
582573
self.assertRaises(tests_utils.ParserException, self.check_parser,
583574
self.cmd, arglist, verifylist)
@@ -587,11 +578,11 @@ def test_flavor_set_with_unexist_flavor(self):
587578
self.flavors_mock.find.side_effect = exceptions.NotFound(None)
588579

589580
arglist = [
590-
'--project', identity_fakes.project_id,
581+
'--project', self.project.id,
591582
'unexist_flavor',
592583
]
593584
verifylist = [
594-
('project', identity_fakes.project_id),
585+
('project', self.project.id),
595586
('flavor', 'unexist_flavor'),
596587
]
597588
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -729,18 +720,15 @@ class TestFlavorUnset(TestFlavor):
729720
# Return value of self.flavors_mock.find().
730721
flavor = compute_fakes.FakeFlavor.create_one_flavor(
731722
attrs={'os-flavor-access:is_public': False})
723+
project = identity_fakes.FakeProject.create_one_project()
732724

733725
def setUp(self):
734726
super(TestFlavorUnset, self).setUp()
735727

736728
self.flavors_mock.find.return_value = self.flavor
737729
self.flavors_mock.get.side_effect = exceptions.NotFound(None)
738730
# Return a project
739-
self.projects_mock.get.return_value = fakes.FakeResource(
740-
None,
741-
copy.deepcopy(identity_fakes.PROJECT),
742-
loaded=True,
743-
)
731+
self.projects_mock.get.return_value = self.project
744732
self.cmd = flavor.UnsetFlavor(self.app, None)
745733

746734
def test_flavor_unset_property(self):
@@ -763,11 +751,11 @@ def test_flavor_unset_property(self):
763751

764752
def test_flavor_unset_project(self):
765753
arglist = [
766-
'--project', identity_fakes.project_id,
754+
'--project', self.project.id,
767755
self.flavor.id,
768756
]
769757
verifylist = [
770-
('project', identity_fakes.project_id),
758+
('project', self.project.id),
771759
('flavor', self.flavor.id),
772760
]
773761
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -779,7 +767,7 @@ def test_flavor_unset_project(self):
779767
is_public=None)
780768
self.flavor_access_mock.remove_tenant_access.assert_called_with(
781769
self.flavor.id,
782-
identity_fakes.project_id,
770+
self.project.id,
783771
)
784772
self.flavor.unset_keys.assert_not_called()
785773
self.assertIsNone(result)
@@ -798,10 +786,10 @@ def test_flavor_unset_no_project(self):
798786

799787
def test_flavor_unset_no_flavor(self):
800788
arglist = [
801-
'--project', identity_fakes.project_id,
789+
'--project', self.project.id,
802790
]
803791
verifylist = [
804-
('project', identity_fakes.project_id),
792+
('project', self.project.id),
805793
]
806794
self.assertRaises(tests_utils.ParserException, self.check_parser,
807795
self.cmd, arglist, verifylist)
@@ -811,11 +799,11 @@ def test_flavor_unset_with_unexist_flavor(self):
811799
self.flavors_mock.find.side_effect = exceptions.NotFound(None)
812800

813801
arglist = [
814-
'--project', identity_fakes.project_id,
802+
'--project', self.project.id,
815803
'unexist_flavor',
816804
]
817805
verifylist = [
818-
('project', identity_fakes.project_id),
806+
('project', self.project.id),
819807
('flavor', 'unexist_flavor'),
820808
]
821809
parsed_args = self.check_parser(self.cmd, arglist, verifylist)

0 commit comments

Comments
 (0)