Fix a few test errors.

pypr · Aug 30, 2018 · 577c205 · 577c205
1 parent 1df44ca
commit 577c205
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/automan/tests/test_automation.py b/automan/tests/test_automation.py
@@ -20,7 +20,7 @@
 except ImportError:
     raise unittest.SkipTest('test_jobs requires psutil')
 
-from automan.tests.test_jobs import wait_until
+from automan.tests.test_jobs import wait_until, safe_rmtree
 
 
 class MySimulation(Simulation):
@@ -97,7 +97,7 @@ def setUp(self):
     def tearDown(self):
         os.chdir(self.cwd)
         if os.path.exists(self.root):
-            shutil.rmtree(self.root)
+            safe_rmtree(self.root)
 
 
 class TestLocalAutomation(TestAutomationBase):
@@ -177,13 +177,7 @@ def setUp(self):
     def tearDown(self):
         super(TestRemoteAutomation, self).tearDown()
         if os.path.exists(self.other_dir):
-            if sys.platform.startswith('win'):
-                try:
-                    shutil.rmtree(self.other_dir)
-                except WindowsError:
-                    pass
-            else:
-                shutil.rmtree(self.other_dir)
+            safe_rmtree(self.other_dir)
 
     def _make_scheduler(self):
         workers = [

diff --git a/automan/tests/test_cluster_manager.py b/automan/tests/test_cluster_manager.py
@@ -28,7 +28,7 @@ class MyClusterManager(ClusterManager):
         #!/bin/bash
 
         set -e
-        python -m venv --system-site-packages envs/{project_name}
+        python3 -m venv --system-site-packages envs/{project_name}
         """)
 
     UPDATE = dedent("""\