From e8898979b5cd860edb85f3b10f88fbf647bcdb9c Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Fri, 12 Jun 2020 01:56:17 +0000
Subject: [PATCH] Drop check for tempest workspace directory

This check is not necessary. The workspace is recreated on each
run, so just attempt to remove the workspace each time.
---
 zaza/openstack/charm_tests/tempest/setup.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/zaza/openstack/charm_tests/tempest/setup.py b/zaza/openstack/charm_tests/tempest/setup.py
index 4266ddc..8f37f02 100644
--- a/zaza/openstack/charm_tests/tempest/setup.py
+++ b/zaza/openstack/charm_tests/tempest/setup.py
@@ -15,7 +15,6 @@
 """Code for configuring and initializing tempest."""
 
 import urllib.parse
-import os
 import subprocess
 
 import zaza.utilities.deployment_env as deployment_env
@@ -253,12 +252,11 @@ def setup_tempest(tempest_template, accounts_template):
     :returns: None
     :rtype: None
     """
-    if os.path.isdir('tempest-workspace'):
-        try:
-            subprocess.check_call(['tempest', 'workspace', 'remove', '--rmdir',
-                                   '--name', 'tempest-workspace'])
-        except subprocess.CalledProcessError:
-            pass
+    try:
+        subprocess.check_call(['tempest', 'workspace', 'remove', '--rmdir',
+                               '--name', 'tempest-workspace'])
+    except subprocess.CalledProcessError:
+        pass
     try:
         subprocess.check_call(['tempest', 'init', 'tempest-workspace'])
     except subprocess.CalledProcessError: