diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-10-01 23:00:19 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-10-02 14:17:29 +0000 |
| commit | 0291266fb61dd398147fa2ae1a37366dd2fa869e (patch) | |
| tree | f8b78eb24997bc4d8a92f36102637fd31ff36c4f /nova/tests | |
| parent | 9e4725031438114be7c88af287e3f5675927fa6a (diff) | |
Add TestCase.stub_module to make stubbing modules easier
Previously various test cases would modify sys.modules directly,
duplicating code unnecessarily.
Change-Id: I09d333d6daf527e34db0262b28edcb0323cb2855
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/network/test_manager.py | 4 | ||||
| -rw-r--r-- | nova/tests/xenapi/stubs.py | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index 2f597547c..c24bee2d8 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -1846,8 +1846,7 @@ class LdapDNSTestCase(test.TestCase): def setUp(self): super(LdapDNSTestCase, self).setUp() - self.saved_ldap = sys.modules.get('ldap') - sys.modules['ldap'] = fake_ldap + self.stub_module('ldap', fake_ldap) self.driver = FakeLdapDNS() self.driver.create_domain(domain1) @@ -1856,7 +1855,6 @@ class LdapDNSTestCase(test.TestCase): def tearDown(self): self.driver.delete_domain(domain1) self.driver.delete_domain(domain2) - sys.modules['ldap'] = self.saved_ldap super(LdapDNSTestCase, self).tearDown() def test_ldap_dns_domains(self): diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py index 35aa8e4aa..cde17a7af 100644 --- a/nova/tests/xenapi/stubs.py +++ b/nova/tests/xenapi/stubs.py @@ -18,7 +18,6 @@ import contextlib import pickle import random -import sys from nova.openstack.common import jsonutils from nova import test @@ -355,16 +354,6 @@ class XenAPITestBase(test.TestCase): def setUp(self): super(XenAPITestBase, self).setUp() - self.orig_XenAPI = sys.modules.get('XenAPI') - sys.modules['XenAPI'] = fake + self.stub_module('XenAPI', fake) fake.reset() - - def tearDown(self): - if self.orig_XenAPI is not None: - sys.modules['XenAPI'] = self.orig_XenAPI - self.orig_XenAPI = None - else: - sys.modules.pop('XenAPI') - - super(XenAPITestBase, self).tearDown() |