From 12a235865a2648ce3b1ff9c469c2238d4f869d38 Mon Sep 17 00:00:00 2001 From: Jay Pipes Date: Fri, 10 Jun 2016 12:14:52 -0400 Subject: [PATCH] Remove redundant test in test_resource_tracker There was a remaining unit test in the old test_resource_tracker.py file that wasn't testing anything substantial. The code was "verifying" that the MigrationList.get_by_compute_host_and_node() method was being called even though the test_tracker.TestUpdateAvailableResource.test_no_instance_dest_migration() test was stressing the same code paths. Remove it and the test class itself now that nothing is using it. Change-Id: I4101b263b73004562b45b0c93963367ad7afbe40 --- .../unit/compute/test_resource_tracker.py | 37 ------------------- 1 file changed, 37 deletions(-) diff --git a/nova/tests/unit/compute/test_resource_tracker.py b/nova/tests/unit/compute/test_resource_tracker.py index 83b307a07d51..119d2d2c4cfc 100644 --- a/nova/tests/unit/compute/test_resource_tracker.py +++ b/nova/tests/unit/compute/test_resource_tracker.py @@ -541,43 +541,6 @@ class BaseTrackerTestCase(BaseTestCase): self.assertEqual(value, x) -class InstanceClaimTestCase(BaseTrackerTestCase): - def _instance_topology(self, mem): - mem = mem * 1024 - return objects.InstanceNUMATopology( - cells=[objects.InstanceNUMACell( - id=0, cpuset=set([1]), memory=mem), - objects.InstanceNUMACell( - id=1, cpuset=set([3]), memory=mem)]) - - def _claim_topology(self, mem, cpus=1): - if self.tracker.driver.numa_topology is None: - return None - mem = mem * 1024 - return objects.NUMATopology( - cells=[objects.NUMACell( - id=0, cpuset=set([1, 2]), memory=3072, cpu_usage=cpus, - memory_usage=mem, mempages=[], siblings=[], - pinned_cpus=set([])), - objects.NUMACell( - id=1, cpuset=set([3, 4]), memory=3072, cpu_usage=cpus, - memory_usage=mem, mempages=[], siblings=[], - pinned_cpus=set([]))]) - - @mock.patch('nova.objects.MigrationList.get_in_progress_by_host_and_node') - def test_deleted_instances_with_migrations(self, mock_migration_list): - migration = objects.Migration(context=self.context, - migration_type='resize', - instance_uuid='invalid') - mock_migration_list.return_value = [migration] - self.tracker.update_available_resource(self.context) - self.assertEqual(0, self.tracker.compute_node.memory_mb_used) - self.assertEqual(0, self.tracker.compute_node.local_gb_used) - mock_migration_list.assert_called_once_with(self.context, - "fakehost", - "fakenode") - - class _MoveClaimTestCase(BaseTrackerTestCase): def setUp(self):