1 files changed, 23 insertions, 14 deletions
diff --git a/openstackclient/tests/functional/volume/v1/test_transfer_request.py b/openstackclient/tests/functional/volume/v1/test_transfer_request.py
index 73191fc9..0399e6cc 100644
--- a/openstackclient/tests/functional/volume/v1/test_transfer_request.py
+++ b/openstackclient/tests/functional/volume/v1/test_transfer_request.py
@@ -29,20 +29,13 @@ class TransferRequestTests(common.BaseVolumeTests):
             'volume create -f json --size 1 ' + cls.VOLUME_NAME))
         cls.assertOutput(cls.VOLUME_NAME, cmd_output['name'])
 
-        cmd_output = json.loads(cls.openstack(
-            'volume transfer request create -f json ' +
-            cls.VOLUME_NAME +
-            ' --name ' + cls.NAME))
-        cls.assertOutput(cls.NAME, cmd_output['name'])
+        cls.wait_for_status("volume", cls.VOLUME_NAME, "available")
 
     @classmethod
     def tearDownClass(cls):
         try:
-            raw_output_transfer = cls.openstack(
-                'volume transfer request delete ' + cls.NAME)
             raw_output_volume = cls.openstack(
                 'volume delete ' + cls.VOLUME_NAME)
-            cls.assertOutput('', raw_output_transfer)
             cls.assertOutput('', raw_output_volume)
         finally:
             super(TransferRequestTests, cls).tearDownClass()
@@ -79,12 +72,28 @@ class TransferRequestTests(common.BaseVolumeTests):
             'volume delete ' + volume_name)
         self.assertEqual('', raw_output)
 
-    def test_volume_transfer_request_list(self):
+    def test_volume_transfer_request_list_show(self):
+        name = uuid.uuid4().hex
         cmd_output = json.loads(self.openstack(
-            'volume transfer request list -f json'))
-        self.assertIn(self.NAME, [req['Name'] for req in cmd_output])
+            'volume transfer request create -f json ' +
+            ' --name ' + name + ' ' +
+            self.VOLUME_NAME
+        ))
+        self.addCleanup(
+            self.openstack,
+            'volume transfer request delete ' + name
+        )
+        self.assertOutput(name, cmd_output['name'])
+        auth_key = cmd_output['auth_key']
+        self.assertTrue(auth_key)
 
-    def test_volume_transfer_request_show(self):
         cmd_output = json.loads(self.openstack(
-            'volume transfer request show -f json ' + self.NAME))
-        self.assertEqual(self.NAME, cmd_output['name'])
+            'volume transfer request list -f json'
+        ))
+        self.assertIn(name, [req['Name'] for req in cmd_output])
+
+        cmd_output = json.loads(self.openstack(
+            'volume transfer request show -f json ' +
+            name
+        ))
+        self.assertEqual(name, cmd_output['name'])