Merge "Use more specific asserts"

watcher/tests/decision_engine/strategy/strategies/test_uniform_airflow.py

@@ -111,7 +111,7 @@ class TestUniformAirflow(base.BaseTestCase):
         vms = model.get_all_vms()
         vms.clear()
         vm_to_mig = self.strategy.choose_vm_to_migrate(h1)
-        self.assertEqual(vm_to_mig, None)
+        self.assertIsNone(vm_to_mig)
 
     def test_filter_destination_hosts(self):
         model = self.fake_cluster.generate_scenario_7_with_2_hypervisors()

watcher/tests/decision_engine/strategy/strategies/test_workload_balance.py

@@ -102,7 +102,7 @@ class TestWorkloadBalance(base.BaseTestCase):
         vms = model.get_all_vms()
         vms.clear()
         vm_to_mig = self.strategy.choose_vm_to_migrate(h1, avg, w_map)
-        self.assertEqual(vm_to_mig, None)
+        self.assertIsNone(vm_to_mig)
 
     def test_filter_destination_hosts(self):
         model = self.fake_cluster.generate_scenario_6_with_2_hypervisors()

watcher/tests/decision_engine/test_sync.py

@@ -376,7 +376,8 @@ class TestSyncer(base.DbTestCase):
 
         self.assertEqual(2, strategy2.goal_id)
         self.assertIn(strategy2.name, created_strategies)
-        self.assertTrue(strategy2.id != created_strategies[strategy2.name].id)
+        self.assertNotEqual(strategy2.id,
+                            created_strategies[strategy2.name].id)
 
         self.assertEqual(set([audit_template2.id,
                               audit_template3.id,