From 4b91cd49658bd5a9224976ebd3a6f352d1eef5b0 Mon Sep 17 00:00:00 2001
From: Brian Haley <bhaley@redhat.com>
Date: Thu, 9 May 2019 15:08:54 -0400
Subject: Stop leaving temp files after unit test runs

test_shell.CLOUD_2 is using an absolute path for a temp
file, so leaves /tmp/test_log_file around after the unit
tests are run.  Use a fixture instead so it's cleaned
automatically, which also removes the possibility of two
tests using the same file and interfering with each other.

Change-Id: If722b860be4010b91635c6d46f634da980e17152
---
 openstackclient/tests/unit/test_shell.py | 37 +++++++++++++++++---------------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'openstackclient/tests/unit/test_shell.py')

diff --git a/openstackclient/tests/unit/test_shell.py b/openstackclient/tests/unit/test_shell.py
index dff37f10..5d413e7e 100644
--- a/openstackclient/tests/unit/test_shell.py
+++ b/openstackclient/tests/unit/test_shell.py
@@ -70,23 +70,6 @@ CLOUD_1 = {
     }
 }
 
-CLOUD_2 = {
-    'clouds': {
-        'megacloud': {
-            'cloud': 'megadodo',
-            'auth': {
-                'project_name': 'heart-o-gold',
-                'username': 'zaphod',
-            },
-            'region_name': 'occ-cloud,krikkit,occ-env',
-            'log_file': '/tmp/test_log_file',
-            'log_level': 'debug',
-            'cert': 'mycert',
-            'key': 'mickey',
-        }
-    }
-}
-
 PUBLIC_1 = {
     'public-clouds': {
         'megadodo': {
@@ -118,6 +101,26 @@ global_options = {
 }
 
 
+def get_cloud(log_file):
+    CLOUD = {
+        'clouds': {
+            'megacloud': {
+                'cloud': 'megadodo',
+                'auth': {
+                    'project_name': 'heart-o-gold',
+                    'username': 'zaphod',
+                },
+                'region_name': 'occ-cloud,krikkit,occ-env',
+                'log_file': log_file,
+                'log_level': 'debug',
+                'cert': 'mycert',
+                'key': 'mickey',
+            }
+        }
+    }
+    return CLOUD
+
+
 # Wrap the osc_lib make_shell() function to set the shell class since
 # osc-lib's TestShell class doesn't allow us to specify it yet.
 # TODO(dtroyer): remove this once the shell_class_patch patch is released
-- 
cgit v1.2.1