Merge "Fix functional tests deletes"

This commit is contained in:
Jenkins
2015-05-28 20:46:27 +00:00
committed by Gerrit Code Review
3 changed files with 4 additions and 3 deletions

View File

@@ -31,7 +31,7 @@ class TestNetwork(base.BaseFunctionalTest):
@classmethod
def tearDownClass(cls):
sot = cls.conn.network.delete_network(cls.NAME)
sot = cls.conn.network.delete_network(cls.ID, ignore_missing=False)
cls.assertIs(None, sot)
def test_find(self):

View File

@@ -31,7 +31,8 @@ class TestContainer(base.BaseFunctionalTest):
def tearDownClass(cls):
pass
# TODO(thowe): uncomment this when bug/1451211 fixed
# tainer = cls.conn.object_store.delete_container(cls.NAME)
# tainer = cls.conn.object_store.delete_container(cls.NAME,
# ignore_missing=False)
# cls.assertIs(None, tainer)
def test_list(self):

View File

@@ -40,7 +40,7 @@ class TestStack(base.BaseFunctionalTest):
@classmethod
def tearDownClass(cls):
super(TestStack, cls).tearDownClass()
cls.conn.orchestration.delete_stack(cls.ID)
cls.conn.orchestration.delete_stack(cls.ID, ignore_missing=False)
cls.conn.compute.delete_keypair(cls.NAME)
def test_list(self):