summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-29 13:26:49 +0000
committerGerrit Code Review <review@openstack.org>2015-11-29 13:26:49 +0000
commitfda84a277fc86443b3ba429dc291770f9b2a48e9 (patch)
tree4813896c63d24a729a20b8f54df97c0feee74528 /openstackclient
parentd6ac1e9205187109b2cc761b8ffa3aa95e23166c (diff)
parentdb516b2c96dd449daad5ff6c9479d87f1457f410 (diff)
downloadpython-openstackclient-fda84a277fc86443b3ba429dc291770f9b2a48e9.tar.gz
Merge "Use FakeFlavor in TestFlavorUnset."
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/tests/compute/v2/test_flavor.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py
index 8ad1f85e..095b5f28 100644
--- a/openstackclient/tests/compute/v2/test_flavor.py
+++ b/openstackclient/tests/compute/v2/test_flavor.py
@@ -13,8 +13,6 @@
# under the License.
#
-import copy
-
from openstackclient.compute.v2 import flavor
from openstackclient.tests.compute.v2 import fakes as compute_fakes
@@ -242,14 +240,13 @@ class TestFlavorSet(TestFlavor):
class TestFlavorUnset(TestFlavor):
+ # Return value of self.flavors_mock.find().
+ flavor = compute_fakes.FakeFlavor.create_one_flavor()
+
def setUp(self):
super(TestFlavorUnset, self).setUp()
- self.flavors_mock.find.return_value = compute_fakes.FakeFlavorResource(
- None,
- copy.deepcopy(compute_fakes.FLAVOR),
- loaded=True,
- )
+ self.flavors_mock.find.return_value = self.flavor
self.cmd = flavor.UnsetFlavor(self.app, None)