From 4f4af3d67df0ca67bb1bd59857dbbd27f059a22a Mon Sep 17 00:00:00 2001
From: "jiahui.qiang" <jiahui.qiang@easystack.cn>
Date: Sat, 21 Jan 2017 18:22:26 +0800
Subject: [PATCH] Switch to use cleanup method in functional test

Switch the delete command in subnet and router functional tests. Because
addCleanup will also work when an assertion fails ,except the test is for
testing delete command.

Change-Id: I33634f5148c4895c7cf4d4773a9c33c8368850c7
---
 .../functional/network/v2/test_router.py      | 17 ++++------
 .../functional/network/v2/test_subnet.py      | 33 ++++++++++++-------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/openstackclient/tests/functional/network/v2/test_router.py b/openstackclient/tests/functional/network/v2/test_router.py
index 443f68b20..aa708e0a6 100644
--- a/openstackclient/tests/functional/network/v2/test_router.py
+++ b/openstackclient/tests/functional/network/v2/test_router.py
@@ -20,7 +20,7 @@ class RouterTests(base.TestCase):
     """Functional tests for router. """
 
     def test_router_create_and_delete(self):
-        """Test create options, delete"""
+        """Test create options, delete multiple"""
         name1 = uuid.uuid4().hex
         name2 = uuid.uuid4().hex
         cmd_output = json.loads(self.openstack(
@@ -75,6 +75,8 @@ class RouterTests(base.TestCase):
             '--disable ' +
             name1
         ))
+
+        self.addCleanup(self.openstack, 'router delete ' + name1)
         self.assertEqual(
             name1,
             cmd_output["name"],
@@ -92,6 +94,8 @@ class RouterTests(base.TestCase):
             '--project ' + demo_project_id +
             ' ' + name2
         ))
+
+        self.addCleanup(self.openstack, 'router delete ' + name2)
         self.assertEqual(
             name2,
             cmd_output["name"],
@@ -141,12 +145,8 @@ class RouterTests(base.TestCase):
         self.assertIn(name1, names)
         self.assertIn(name2, names)
 
-        del_output = self.openstack(
-            'router delete ' + name1 + ' ' + name2)
-        self.assertOutput('', del_output)
-
     def test_router_set_show_unset(self):
-        """Tests create router, set, unset, show, delete"""
+        """Tests create router, set, unset, show"""
 
         name = uuid.uuid4().hex
         new_name = name + "_"
@@ -155,6 +155,7 @@ class RouterTests(base.TestCase):
             '--description aaaa ' +
             name
         ))
+        self.addCleanup(self.openstack, 'router delete ' + new_name)
         self.assertEqual(
             name,
             cmd_output["name"],
@@ -221,7 +222,3 @@ class RouterTests(base.TestCase):
             new_name
         ))
         self.assertIsNone(cmd_output["external_gateway_info"])
-
-        del_output = self.openstack(
-            'router delete ' + new_name)
-        self.assertOutput('', del_output)
diff --git a/openstackclient/tests/functional/network/v2/test_subnet.py b/openstackclient/tests/functional/network/v2/test_subnet.py
index 995a49798..61cffcde4 100644
--- a/openstackclient/tests/functional/network/v2/test_subnet.py
+++ b/openstackclient/tests/functional/network/v2/test_subnet.py
@@ -37,7 +37,7 @@ class SubnetTests(base.TestCase):
         cls.assertOutput('', raw_output)
 
     def test_subnet_create_and_delete(self):
-        """Test create, delete"""
+        """Test create, delete multiple"""
         name1 = uuid.uuid4().hex
         cmd = ('subnet create -f json --network ' +
                self.NETWORK_NAME +
@@ -51,9 +51,22 @@ class SubnetTests(base.TestCase):
             self.NETWORK_ID,
             cmd_output["network_id"],
         )
+        name2 = uuid.uuid4().hex
+        cmd = ('subnet create -f json --network ' +
+               self.NETWORK_NAME +
+               ' --subnet-range')
+        cmd_output = self._subnet_create(cmd, name2)
+        self.assertEqual(
+            name2,
+            cmd_output["name"],
+        )
+        self.assertEqual(
+            self.NETWORK_ID,
+            cmd_output["network_id"],
+        )
 
         del_output = self.openstack(
-            'subnet delete ' + name1)
+            'subnet delete ' + name1 + ' ' + name2)
         self.assertOutput('', del_output)
 
     def test_subnet_list(self):
@@ -64,6 +77,8 @@ class SubnetTests(base.TestCase):
                '--network ' + self.NETWORK_NAME +
                ' --dhcp --subnet-range')
         cmd_output = self._subnet_create(cmd, name1)
+
+        self.addCleanup(self.openstack, 'subnet delete ' + name1)
         self.assertEqual(
             name1,
             cmd_output["name"],
@@ -86,6 +101,8 @@ class SubnetTests(base.TestCase):
                ' --ip-version 6 --no-dhcp ' +
                '--subnet-range')
         cmd_output = self._subnet_create(cmd, name2, is_type_ipv4=False)
+
+        self.addCleanup(self.openstack, 'subnet delete ' + name2)
         self.assertEqual(
             name2,
             cmd_output["name"],
@@ -148,12 +165,8 @@ class SubnetTests(base.TestCase):
         self.assertNotIn(name1, names)
         self.assertIn(name2, names)
 
-        del_output = self.openstack(
-            'subnet delete ' + name1 + ' ' + name2)
-        self.assertOutput('', del_output)
-
     def test_subnet_set_show_unset(self):
-        """Test create subnet, set, unset, show, delete"""
+        """Test create subnet, set, unset, show"""
 
         name = uuid.uuid4().hex
         new_name = name + "_"
@@ -161,6 +174,8 @@ class SubnetTests(base.TestCase):
                '--network ' + self.NETWORK_NAME +
                ' --description aaaa --subnet-range')
         cmd_output = self._subnet_create(cmd, name)
+
+        self.addCleanup(self.openstack, 'subnet delete ' + new_name)
         self.assertEqual(
             name,
             cmd_output["name"],
@@ -224,10 +239,6 @@ class SubnetTests(base.TestCase):
             cmd_output["service_types"],
         )
 
-        del_output = self.openstack(
-            'subnet delete ' + new_name)
-        self.assertOutput('', del_output)
-
     def _subnet_create(self, cmd, name, is_type_ipv4=True):
         # Try random subnet range for subnet creating
         # Because we can not determine ahead of time what subnets are already