From faba7cf44bcf59d9ac7e342cd4b4d40883341ca5 Mon Sep 17 00:00:00 2001 From: "Yunhong, Jiang" Date: Thu, 1 Nov 2012 11:38:48 +0800 Subject: Check instance_type in compute capability filter Instance type is guaranteed to exist and not be None or empty dict as a quite a while ago, although it used to be that prep_resize didn't have it. Remove the checking for instance_type. Change-Id: I391615114bd9d9359eeb0b2b3642dcec86a8285e Signed-off-by: Yunhong, Jiang --- nova/tests/scheduler/test_host_filters.py | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py index f19755b82..31efc7a36 100644 --- a/nova/tests/scheduler/test_host_filters.py +++ b/nova/tests/scheduler/test_host_filters.py @@ -628,17 +628,6 @@ class HostFiltersTestCase(test.TestCase): 'service': service}) self.assertFalse(filt_cls.host_passes(host, filter_properties)) - def test_compute_filter_passes_on_no_instance_type(self): - self._stub_service_is_up(True) - filt_cls = self.class_map['ComputeFilter']() - filter_properties = {} - capabilities = {'enabled': False} - service = {'disabled': False} - host = fakes.FakeHostState('host1', 'node1', - {'free_ram_mb': 1024, 'capabilities': capabilities, - 'service': service}) - self.assertTrue(filt_cls.host_passes(host, filter_properties)) - def test_image_properties_filter_passes_same_inst_props(self): self._stub_service_is_up(True) filt_cls = self.class_map['ImagePropertiesFilter']() -- cgit