diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-12 23:26:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-12 23:26:50 +0000 |
| commit | f8ddb4dd1fce5bf6332e360cc26743f8a32d4a18 (patch) | |
| tree | 5277c73715b5d9f9a0a679925da0e91a79cca65e | |
| parent | d32aba1a64637dc58cf72641b116cb2413f2b7a6 (diff) | |
| parent | b05bc6018612e2c5c999700a67bea801548d6a8b (diff) | |
| download | nova-f8ddb4dd1fce5bf6332e360cc26743f8a32d4a18.tar.gz nova-f8ddb4dd1fce5bf6332e360cc26743f8a32d4a18.tar.xz nova-f8ddb4dd1fce5bf6332e360cc26743f8a32d4a18.zip | |
Merge "Fixes test_config_drive unittest"
| -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) |