merged trunk
This commit is contained in:
@@ -311,4 +311,5 @@ class S3APITestCase(test.TestCase):
|
|||||||
self.auth_manager.delete_user('admin')
|
self.auth_manager.delete_user('admin')
|
||||||
self.auth_manager.delete_project('admin')
|
self.auth_manager.delete_project('admin')
|
||||||
stop_listening = defer.maybeDeferred(self.listening_port.stopListening)
|
stop_listening = defer.maybeDeferred(self.listening_port.stopListening)
|
||||||
|
super(S3APITestCase, self).tearDown()
|
||||||
return defer.DeferredList([stop_listening])
|
return defer.DeferredList([stop_listening])
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ class DirectTestCase(test.TestCase):
|
|||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
direct.ROUTES = {}
|
direct.ROUTES = {}
|
||||||
|
super(DirectTestCase, self).tearDown()
|
||||||
|
|
||||||
def test_delegated_auth(self):
|
def test_delegated_auth(self):
|
||||||
req = webob.Request.blank('/fake/context')
|
req = webob.Request.blank('/fake/context')
|
||||||
|
|||||||
@@ -150,6 +150,7 @@ class SimpleDriverTestCase(test.TestCase):
|
|||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
self.manager.delete_user(self.user)
|
self.manager.delete_user(self.user)
|
||||||
self.manager.delete_project(self.project)
|
self.manager.delete_project(self.project)
|
||||||
|
super(SimpleDriverTestCase, self).tearDown()
|
||||||
|
|
||||||
def _create_instance(self, **kwargs):
|
def _create_instance(self, **kwargs):
|
||||||
"""Create a test instance"""
|
"""Create a test instance"""
|
||||||
|
|||||||
@@ -206,9 +206,9 @@ class LibvirtConnTestCase(test.TestCase):
|
|||||||
self.assertEquals(uri, testuri)
|
self.assertEquals(uri, testuri)
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
super(LibvirtConnTestCase, self).tearDown()
|
|
||||||
self.manager.delete_project(self.project)
|
self.manager.delete_project(self.project)
|
||||||
self.manager.delete_user(self.user)
|
self.manager.delete_user(self.user)
|
||||||
|
super(LibvirtConnTestCase, self).tearDown()
|
||||||
|
|
||||||
|
|
||||||
class IptablesFirewallTestCase(test.TestCase):
|
class IptablesFirewallTestCase(test.TestCase):
|
||||||
@@ -388,6 +388,7 @@ class NWFilterTestCase(test.TestCase):
|
|||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
self.manager.delete_project(self.project)
|
self.manager.delete_project(self.project)
|
||||||
self.manager.delete_user(self.user)
|
self.manager.delete_user(self.user)
|
||||||
|
super(NWFilterTestCase, self).tearDown()
|
||||||
|
|
||||||
def test_cidr_rule_nwfilter_xml(self):
|
def test_cidr_rule_nwfilter_xml(self):
|
||||||
cloud_controller = cloud.CloudController()
|
cloud_controller = cloud.CloudController()
|
||||||
|
|||||||
Reference in New Issue
Block a user