diff options
author | Monty Taylor <mordred@inaugust.com> | 2013-01-23 09:59:46 -0500 |
---|---|---|
committer | Monty Taylor <mordred@inaugust.com> | 2013-01-24 16:30:26 +1100 |
commit | 8c80224ecb5194a5e2ed5f74f1c7f457202d21a3 (patch) | |
tree | a557a9524e402e8cd98da702ea805c1cf8d430bb /tests/unit/rpc/test_matchmaker.py | |
parent | 3d2800087ce38ff954c50e5a86916784682ed1bd (diff) | |
download | oslo-8c80224ecb5194a5e2ed5f74f1c7f457202d21a3.tar.gz oslo-8c80224ecb5194a5e2ed5f74f1c7f457202d21a3.tar.xz oslo-8c80224ecb5194a5e2ed5f74f1c7f457202d21a3.zip |
Replace direct use of testtools BaseTestCase.
Using the BaseTestCase across the tests in the tree lets us put in log
fixtures and consistently handle mox and stubout.
Part of blueprint grizzly-testtools.
Change-Id: Iba7eb2c63b0c514009b2c28e5930b27726a147b0
Diffstat (limited to 'tests/unit/rpc/test_matchmaker.py')
-rw-r--r-- | tests/unit/rpc/test_matchmaker.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/unit/rpc/test_matchmaker.py b/tests/unit/rpc/test_matchmaker.py index ddfb776..484e182 100644 --- a/tests/unit/rpc/test_matchmaker.py +++ b/tests/unit/rpc/test_matchmaker.py @@ -15,15 +15,15 @@ # under the License. import logging -import testtools from openstack.common.rpc import matchmaker +from tests import utils LOG = logging.getLogger(__name__) -class _MatchMakerTestCase(testtools.TestCase): +class _MatchMakerTestCase(object): def test_valid_host_matches(self): queues = self.driver.queues(self.topic) matched_hosts = map(lambda x: x[1], queues) @@ -41,20 +41,20 @@ class _MatchMakerTestCase(testtools.TestCase): self.assertTrue(host in matched_hosts) -class MatchMakerFileTestCase(_MatchMakerTestCase): +class MatchMakerFileTestCase(utils.BaseTestCase, _MatchMakerTestCase): def setUp(self): + super(MatchMakerFileTestCase, self).setUp() self.topic = "test" self.hosts = ['hello', 'world', 'foo', 'bar', 'baz'] ring = { self.topic: self.hosts } self.driver = matchmaker.MatchMakerRing(ring) - super(MatchMakerFileTestCase, self).setUp() -class MatchMakerLocalhostTestCase(_MatchMakerTestCase): +class MatchMakerLocalhostTestCase(utils.BaseTestCase, _MatchMakerTestCase): def setUp(self): + super(MatchMakerLocalhostTestCase, self).setUp() self.driver = matchmaker.MatchMakerLocalhost() self.topic = "test" self.hosts = ['localhost'] - super(MatchMakerLocalhostTestCase, self).setUp() |