Merge "Fix functional tests deletes"
This commit is contained in:
@@ -31,7 +31,7 @@ class TestNetwork(base.BaseFunctionalTest):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def tearDownClass(cls):
|
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)
|
cls.assertIs(None, sot)
|
||||||
|
|
||||||
def test_find(self):
|
def test_find(self):
|
||||||
|
@@ -31,7 +31,8 @@ class TestContainer(base.BaseFunctionalTest):
|
|||||||
def tearDownClass(cls):
|
def tearDownClass(cls):
|
||||||
pass
|
pass
|
||||||
# TODO(thowe): uncomment this when bug/1451211 fixed
|
# 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)
|
# cls.assertIs(None, tainer)
|
||||||
|
|
||||||
def test_list(self):
|
def test_list(self):
|
||||||
|
@@ -40,7 +40,7 @@ class TestStack(base.BaseFunctionalTest):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def tearDownClass(cls):
|
def tearDownClass(cls):
|
||||||
super(TestStack, cls).tearDownClass()
|
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)
|
cls.conn.compute.delete_keypair(cls.NAME)
|
||||||
|
|
||||||
def test_list(self):
|
def test_list(self):
|
||||||
|
Reference in New Issue
Block a user