openstack/python-openstackclient
Code Issues Proposed changes

Refactor: Move FakeFlavorResource to compute_fakes.py.

Browse Source 
Just like FakeServer and FakeResource, FakeFlavorResource should be in compute_fakes.py.

Change-Id: I8315256fb90377605fa2190e24c9674f6aaf6efd
Implements: blueprint improve-flavor-unit-test
This commit is contained in:
Tang Chen 2015-11-28 15:25:39 +08:00
parent f19ff68e59
commit 109672fecb
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openstackclient/tests/compute/v2/fakes.py
View File

@ -209,3 +209,24 @@ class FakeServer(object):
if servers is None:
servers = FakeServer.create_servers(count)
return mock.MagicMock(side_effect=servers)
class FakeFlavorResource(fakes.FakeResource):
"""Fake flavor object's methods to help test.
The flavor object has three methods to get, set, unset its properties.
Need to fake them, otherwise the functions to be tested won't run properly.
"""
# Fake properties.
_keys = {'property': 'value'}
def set_keys(self, args):
self._keys.update(args)
def unset_keys(self, keys):
for key in keys:
self._keys.pop(key, None)
def get_keys(self):
return self._keys

22
openstackclient/tests/compute/v2/test_flavor.py
View File

@ -17,22 +17,6 @@ import copy
from openstackclient.compute.v2 import flavor
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import fakes
class FakeFlavorResource(fakes.FakeResource):
_keys = {'property': 'value'}
def set_keys(self, args):
self._keys.update(args)
def unset_keys(self, keys):
for key in keys:
self._keys.pop(key, None)
def get_keys(self):
return self._keys
class TestFlavor(compute_fakes.TestComputev2):
@ -81,7 +65,7 @@ class TestFlavorList(TestFlavor):
super(TestFlavorList, self).setUp()
self.flavors_mock.list.return_value = [
FakeFlavorResource(
compute_fakes.FakeFlavorResource(
None,
copy.deepcopy(compute_fakes.FLAVOR),
loaded=True,
@ -232,7 +216,7 @@ class TestFlavorSet(TestFlavor):
def setUp(self):
super(TestFlavorSet, self).setUp()
self.flavors_mock.find.return_value = FakeFlavorResource(
self.flavors_mock.find.return_value = compute_fakes.FakeFlavorResource(
None,
copy.deepcopy(compute_fakes.FLAVOR),
loaded=True,
@ -265,7 +249,7 @@ class TestFlavorUnset(TestFlavor):
def setUp(self):
super(TestFlavorUnset, self).setUp()
self.flavors_mock.find.return_value = FakeFlavorResource(
self.flavors_mock.find.return_value = compute_fakes.FakeFlavorResource(
None,
copy.deepcopy(compute_fakes.FLAVOR),
loaded=True,