diff options
| author | Chris Yeoh <cyeoh@au1.ibm.com> | 2013-06-07 15:11:48 +0930 |
|---|---|---|
| committer | Chris Yeoh <cyeoh@au1.ibm.com> | 2013-06-07 15:16:46 +0930 |
| commit | b05bc6018612e2c5c999700a67bea801548d6a8b (patch) | |
| tree | d3f8d74e1188f4ee45b0df7d77be388fc140343b /nova | |
| parent | 7a475d3cd606e68090075c1a8944e3aeb7898b87 (diff) | |
| download | nova-b05bc6018612e2c5c999700a67bea801548d6a8b.tar.gz nova-b05bc6018612e2c5c999700a67bea801548d6a8b.tar.xz nova-b05bc6018612e2c5c999700a67bea801548d6a8b.zip | |
Fixes test_config_drive unittest
Fixes test_detail_servers in the config drive unittest where the wrong db
stub was set which resulted in an empty server list being returned.
Fixes asserTrue typo which was never executed because of the empty server
list bug
Change-Id: I160e91c55e60e3636804b4d2b31800386a21538d
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_config_drive.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_config_drive.py b/nova/tests/api/openstack/compute/contrib/test_config_drive.py index 235b9373b..357350b9f 100644 --- a/nova/tests/api/openstack/compute/contrib/test_config_drive.py +++ b/nova/tests/api/openstack/compute/contrib/test_config_drive.py @@ -47,10 +47,11 @@ class ConfigDriveTest(test.TestCase): self.assertTrue('config_drive' in res_dict['server']) def test_detail_servers(self): - self.stubs.Set(db, 'instance_get', - fakes.fake_instance_get()) + self.stubs.Set(db, 'instance_get_all_by_filters', + fakes.fake_instance_get_all_by_filters()) req = fakes.HTTPRequest.blank('/v2/fake/servers/detail') res = req.get_response(fakes.wsgi_app(init_only=('servers,'))) server_dicts = jsonutils.loads(res.body)['servers'] + self.assertNotEqual(len(server_dicts), 0) for server_dict in server_dicts: - self.asserTrue('config_drive' in server_dict) + self.assertTrue('config_drive' in server_dict) |