commit 40c1ec47fb78c5bb87459d5e529cd28643dba6d8
author Jenkins <jenkins@review.openstack.org> Fri Aug 30 02:21:29 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Aug 30 02:21:29 2013 +0000
tree e8facb4b2043a27bbfd651f07c859715d47f1d56
parent bdaf137d954d9dbd46f42a1b5d41a44fa2373913
parent 2732fcaa63509ae08a34160e1ee55f80780d1bc8

Merge "moves addCleanup few lines upper to avoid potential leftovers"

tempest/api/compute/keypairs/test_keypairs.py

diff --git a/tempest/api/compute/keypairs/test_keypairs.py b/tempest/api/compute/keypairs/test_keypairs.py
index 4848cce..083fbd7 100644
--- a/tempest/api/compute/keypairs/test_keypairs.py
+++ b/tempest/api/compute/keypairs/test_keypairs.py
@@ -84,9 +84,9 @@
         # Keypair should be created, Got details by name and deleted
         k_name = rand_name('keypair-')
         resp, keypair = self.client.create_keypair(k_name)
+        self.addCleanup(self.client.delete_keypair, k_name)
         resp, keypair_detail = self.client.get_keypair(k_name)
         self.assertEqual(200, resp.status)
-        self.addCleanup(self.client.delete_keypair, k_name)
         self.assertIn('name', keypair_detail)
         self.assertIn('public_key', keypair_detail)
         self.assertEqual(keypair_detail['name'], k_name,