From 7e02e33c1f6947d9e809b0f8185f23f7241c4979 Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Sun, 26 Jan 2014 16:58:12 +0800 Subject: [PATCH] Use assertIsInstance to test the results of get_engine and get_provider Replace to TODO(boris-42) in test_engine and test_provider with assertIsInstance. Change-Id: I6c486520af15e928d2098a5c10d348b4a16b11da --- tests/deploy/test_engine.py | 3 +-- tests/serverprovider/test_provider.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/deploy/test_engine.py b/tests/deploy/test_engine.py index e64073361d..5b660b0a5e 100644 --- a/tests/deploy/test_engine.py +++ b/tests/deploy/test_engine.py @@ -223,8 +223,7 @@ class EngineFactoryTestCase(test.TestCase): for e in engines: engine_inst = deploy.EngineFactory.get_engine(e.__name__, deployment) - # TODO(boris-42): make it work through assertIsInstance - self.assertEqual(str(type(engine_inst)), str(e)) + self.assertIsInstance(engine_inst, e) def test_get_available_engines(self): engines = set([e.__name__ for e in EngineFactoryTestCase.FAKE_ENGINES]) diff --git a/tests/serverprovider/test_provider.py b/tests/serverprovider/test_provider.py index 568882efbc..bce66f0434 100644 --- a/tests/serverprovider/test_provider.py +++ b/tests/serverprovider/test_provider.py @@ -64,8 +64,7 @@ class ProviderTestCase(test.TestCase): for p in FAKE_PROVIDERS: p_inst = ProviderFactory.get_provider({"name": p.__name__}, None) - # TODO(boris-42): make it work through assertIsInstance - self.assertEqual(str(type(p_inst)), str(p)) + self.assertIsInstance(p_inst, p) def test_get_available_providers(self): providers = set([p.__name__ for p in FAKE_PROVIDERS])