Skip to content

Commit 109672f

Browse files
committed
Refactor: Move FakeFlavorResource to compute_fakes.py.
Just like FakeServer and FakeResource, FakeFlavorResource should be in compute_fakes.py. Change-Id: I8315256fb90377605fa2190e24c9674f6aaf6efd Implements: blueprint improve-flavor-unit-test
1 parent f19ff68 commit 109672f

2 files changed

Lines changed: 24 additions & 19 deletions

File tree

openstackclient/tests/compute/v2/fakes.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,3 +209,24 @@ def get_servers(servers=None, count=2):
209209
if servers is None:
210210
servers = FakeServer.create_servers(count)
211211
return mock.MagicMock(side_effect=servers)
212+
213+
214+
class FakeFlavorResource(fakes.FakeResource):
215+
"""Fake flavor object's methods to help test.
216+
217+
The flavor object has three methods to get, set, unset its properties.
218+
Need to fake them, otherwise the functions to be tested won't run properly.
219+
"""
220+
221+
# Fake properties.
222+
_keys = {'property': 'value'}
223+
224+
def set_keys(self, args):
225+
self._keys.update(args)
226+
227+
def unset_keys(self, keys):
228+
for key in keys:
229+
self._keys.pop(key, None)
230+
231+
def get_keys(self):
232+
return self._keys

openstackclient/tests/compute/v2/test_flavor.py

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,6 @@
1717

1818
from openstackclient.compute.v2 import flavor
1919
from openstackclient.tests.compute.v2 import fakes as compute_fakes
20-
from openstackclient.tests import fakes
21-
22-
23-
class FakeFlavorResource(fakes.FakeResource):
24-
25-
_keys = {'property': 'value'}
26-
27-
def set_keys(self, args):
28-
self._keys.update(args)
29-
30-
def unset_keys(self, keys):
31-
for key in keys:
32-
self._keys.pop(key, None)
33-
34-
def get_keys(self):
35-
return self._keys
3620

3721

3822
class TestFlavor(compute_fakes.TestComputev2):
@@ -81,7 +65,7 @@ def setUp(self):
8165
super(TestFlavorList, self).setUp()
8266

8367
self.flavors_mock.list.return_value = [
84-
FakeFlavorResource(
68+
compute_fakes.FakeFlavorResource(
8569
None,
8670
copy.deepcopy(compute_fakes.FLAVOR),
8771
loaded=True,
@@ -232,7 +216,7 @@ class TestFlavorSet(TestFlavor):
232216
def setUp(self):
233217
super(TestFlavorSet, self).setUp()
234218

235-
self.flavors_mock.find.return_value = FakeFlavorResource(
219+
self.flavors_mock.find.return_value = compute_fakes.FakeFlavorResource(
236220
None,
237221
copy.deepcopy(compute_fakes.FLAVOR),
238222
loaded=True,
@@ -265,7 +249,7 @@ class TestFlavorUnset(TestFlavor):
265249
def setUp(self):
266250
super(TestFlavorUnset, self).setUp()
267251

268-
self.flavors_mock.find.return_value = FakeFlavorResource(
252+
self.flavors_mock.find.return_value = compute_fakes.FakeFlavorResource(
269253
None,
270254
copy.deepcopy(compute_fakes.FLAVOR),
271255
loaded=True,

0 commit comments

Comments
 (0)