diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-07 21:30:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-07 21:30:07 +0000 |
| commit | 90c02e2cf93c188b45903d0815bea6920db279da (patch) | |
| tree | 3df147478f083baaf4fb345bd1716426abc35164 /nova/tests | |
| parent | d8a3a064f81d3109f8aca495da5d09dee99e53cb (diff) | |
| parent | 32bdea27c17eda9fdb2ac70a2556af6dc073dede (diff) | |
Merge "Return to skipping filters when using force_hosts."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/scheduler/test_host_manager.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nova/tests/scheduler/test_host_manager.py b/nova/tests/scheduler/test_host_manager.py index ae7774bac..91e719ab6 100644 --- a/nova/tests/scheduler/test_host_manager.py +++ b/nova/tests/scheduler/test_host_manager.py @@ -82,11 +82,12 @@ class HostManagerTestCase(test.TestCase): self.host_manager._choose_host_filters(specified_filters).AndReturn( [FakeFilterClass1]) - def _verify_result(self, info, result): + def _verify_result(self, info, result, filters=True): for x in info['got_fprops']: self.assertEqual(x, info['expected_fprops']) - self.assertEqual(set(info['expected_objs']), set(info['got_objs'])) - self.assertEqual(set(result), set(info['got_objs'])) + if filters: + self.assertEqual(set(info['expected_objs']), set(info['got_objs'])) + self.assertEqual(set(info['expected_objs']), set(result)) def test_get_filtered_hosts(self): fake_properties = {'moo': 1, 'cow': 2} @@ -143,7 +144,7 @@ class HostManagerTestCase(test.TestCase): result = self.host_manager.get_filtered_hosts(self.fake_hosts, fake_properties) - self._verify_result(info, result) + self._verify_result(info, result, False) def test_get_filtered_hosts_with_no_matching_force_hosts(self): fake_properties = {'force_hosts': ['fake_host5', 'fake_host6']} @@ -156,7 +157,7 @@ class HostManagerTestCase(test.TestCase): result = self.host_manager.get_filtered_hosts(self.fake_hosts, fake_properties) - self._verify_result(info, result) + self._verify_result(info, result, False) def test_get_filtered_hosts_with_ignore_and_force(self): # Ensure ignore_hosts processed before force_hosts in host filters. @@ -172,7 +173,7 @@ class HostManagerTestCase(test.TestCase): result = self.host_manager.get_filtered_hosts(self.fake_hosts, fake_properties) - self._verify_result(info, result) + self._verify_result(info, result, False) def test_update_service_capabilities(self): service_states = self.host_manager.service_states |