openstack/python-openstackclient
Code Issues Proposed changes

Use class FakeServer in TestServerImageCreate.

Browse Source 
There are the same problems with TestServerCreate in TestServerImageCreate.
Use the new class FakeServer to fix them.

Change-Id: Ie723fa95620549f09a81ef72953f46877ef9252a
Implements: blueprint osc-unit-test-framework-improvement
This commit is contained in:
Tang Chen 2015-11-21 16:19:45 +08:00
parent 1cf5c5525b
commit 588d73461e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openstackclient/tests/compute/v2/test_server.py
View File

@ -476,12 +476,10 @@ class TestServerImageCreate(TestServer):
def setUp(self): def setUp(self):
super(TestServerImageCreate, self).setUp() super(TestServerImageCreate, self).setUp()
self.server = fakes.FakeServer.create_one_server()
# This is the return value for utils.find_resource() # This is the return value for utils.find_resource()
self.servers_mock.get.return_value = fakes.FakeResource( self.servers_mock.get.return_value = self.server
None,
copy.deepcopy(compute_fakes.SERVER),
loaded=True,
)
self.servers_mock.create_image.return_value = image_fakes.image_id self.servers_mock.create_image.return_value = image_fakes.image_id
@ -496,10 +494,10 @@ class TestServerImageCreate(TestServer):
def test_server_image_create_no_options(self): def test_server_image_create_no_options(self):
arglist = [ arglist = [
compute_fakes.server_id, self.server.id,
] ]
verifylist = [ verifylist = [
('server', compute_fakes.server_id), ('server', self.server.id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -509,7 +507,7 @@ class TestServerImageCreate(TestServer):
# ServerManager.create_image(server, image_name, metadata=) # ServerManager.create_image(server, image_name, metadata=)
self.servers_mock.create_image.assert_called_with( self.servers_mock.create_image.assert_called_with(
self.servers_mock.get.return_value, self.servers_mock.get.return_value,
compute_fakes.server_name, self.server.name,
) )
collist = ('id', 'name', 'owner', 'protected', 'tags', 'visibility') collist = ('id', 'name', 'owner', 'protected', 'tags', 'visibility')
@ -527,11 +525,11 @@ class TestServerImageCreate(TestServer):
def test_server_image_create_name(self): def test_server_image_create_name(self):
arglist = [ arglist = [
'--name', 'img-nam', '--name', 'img-nam',
compute_fakes.server_id, self.server.id,
] ]
verifylist = [ verifylist = [
('name', 'img-nam'), ('name', 'img-nam'),
('server', compute_fakes.server_id), ('server', self.server.id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)