clean up files before running tests

stephas · Mar 28, 2012 · 7d005f9 · 7d005f9
1 parent 118c028
commit 7d005f9
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
@@ -1,7 +1,14 @@
+'''
+Set up the Salt integration test suite
+'''
+
+# Import Python libs
 import multiprocessing
 import os
+import shutil
 import signal
 
+# Import Salt libs
 import salt
 import salt.config
 import salt.master
@@ -27,6 +34,9 @@ def __enter__(self):
             os.path.join(INTEGRATION_TEST_DIR, 'files/conf/master'))
         self.minion_opts = salt.config.minion_config(
             os.path.join(INTEGRATION_TEST_DIR, 'files/conf/minion'))
+        # clean up the old files
+        if os.path.isdir(self.master_opts['root_dir']):
+            shutil.rmtree(self.master_opts['root_dir'])
         self.master_opts['file_roots'] = FILES
         self.master_opts['hosts.file'] = os.path.join(TMP, 'hosts')
         self.minion_opts['file_roots'] = FILES