diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-21 05:18:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-21 05:18:26 +0000 |
| commit | ee75f9efb4d69bca400ad4b5a2c901540963ebb4 (patch) | |
| tree | 6c182b0fae18bb268ed7da1cd78eaa938fe95651 /nova/tests | |
| parent | c7646aa88d564694b99a569c3cdd2c7ffbbb745d (diff) | |
| parent | d7448fc86a929226a34e92ef77684441f451edaf (diff) | |
Merge "Handle FlavorNotFound on server list w/ filter"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_compute.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 992b1076f..421a0ef89 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -2469,9 +2469,9 @@ class ComputeAPITestCase(BaseTestCase): search_opts={'flavor': 5}) self.assertEqual(len(instances), 0) - self.assertRaises(exception.FlavorNotFound, - self.compute_api.get_all, - c, search_opts={'flavor': 99}) + # ensure unknown filter maps to an empty list, not an exception + instances = self.compute_api.get_all(c, search_opts={'flavor': 99}) + self.assertEqual(instances, []) instances = self.compute_api.get_all(c, search_opts={'flavor': 3}) self.assertEqual(len(instances), 1) |