x/python-ganttclient
Code Issues Proposed changes

Merge changes I8c559483,If92c613b

Browse Source 
* changes:
  fix a syntax error in libvirt.attach_volume() with lxc
  tests: fix LdapDNS to allow running test_network in isolation
This commit is contained in:
Jenkins
2012-02-16 01:32:19 +00:00
committed by Gerrit Code Review
parent d11c5921c5 5866e257b6
commit ce7962eec7
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nova/tests/test_network.py
View File

@@ -16,6 +16,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import mox import mox
import sys
from nova import context from nova import context
from nova import db from nova import db
@@ -1512,6 +1513,11 @@ class LdapDNSTestCase(test.TestCase):
"""Tests nova.network.ldapdns.LdapDNS""" """Tests nova.network.ldapdns.LdapDNS"""
def setUp(self): def setUp(self):
super(LdapDNSTestCase, self).setUp() super(LdapDNSTestCase, self).setUp()
self.saved_ldap = sys.modules.get('ldap')
import nova.auth.fakeldap
sys.modules['ldap'] = nova.auth.fakeldap
temp = utils.import_object('nova.network.ldapdns.FakeLdapDNS') temp = utils.import_object('nova.network.ldapdns.FakeLdapDNS')
self.driver = temp self.driver = temp
self.driver.create_domain(domain1) self.driver.create_domain(domain1)
@@ -1521,6 +1527,7 @@ class LdapDNSTestCase(test.TestCase):
super(LdapDNSTestCase, self).tearDown() super(LdapDNSTestCase, self).tearDown()
self.driver.delete_domain(domain1) self.driver.delete_domain(domain1)
self.driver.delete_domain(domain2) self.driver.delete_domain(domain2)
sys.modules['ldap'] = self.saved_ldap
def test_ldap_dns_domains(self): def test_ldap_dns_domains(self):
domains = self.driver.get_domains() domains = self.driver.get_domains()