WIP setup/teardown

Author: deathaxe

tests/test_3141596.py

@@ -13,7 +13,8 @@
 BASEDIR = os.path.dirname(os.path.abspath(__file__))
 
 
-def set_package(packages_path, package):
+def setup_package(package):
+    packages_path = sublime.packages_path()
     package_path = os.path.join(packages_path, package)
     try:
         shutil.rmtree(package_path)
@@ -30,20 +31,19 @@ def set_package(packages_path, package):
         pass
 
 
-def cleanup_package(packages_path, package):
+def cleanup_package(package):
     try:
-        shutil.rmtree(os.path.join(packages_path, package))
+        shutil.rmtree(os.path.join(sublime.packages_path(), package))
     except FileNotFoundError:
         pass
 
 
-def prepare_package(package, output=None, syntax_test=False, syntax_compatibility=False,
-                    color_scheme_test=False, delay=200, wait_timeout=5000):
+def test_package(package, output=None, syntax_test=False, syntax_compatibility=False,
+                 color_scheme_test=False, wait_timeout=5000):
     def wrapper(func):
         @wraps(func)
         def real_wrapper(self):
             packages_path = sublime.packages_path()
-            set_package(packages_path, package)
 
             if output:
                 # set by _Output/unittesting.json
@@ -53,7 +53,6 @@ def real_wrapper(self):
                 outfile = os.path.join(packages_path, "User", "UnitTesting", package, "result")
                 result_file = outfile
 
-            yield delay
             yield AWAIT_WORKER
 
             kwargs = {"package": package}
@@ -89,8 +88,6 @@ def condition():
             if isiterable(deferred):
                 yield from deferred
 
-            cleanup_package(packages_path, package)
-
             yield
 
         return real_wrapper
@@ -112,54 +109,84 @@ def assertOk(self, txt, msg=None):
 
 class TestUnitTesting(UnitTestingTestCase):
 
-    @prepare_package("_Success")
+    def setUp(self):
+        setup_package("_Success")
+        setup_package("_Failure")
+        setup_package("_Empty")
+        setup_package("_Output")
+        setup_package("_Deferred")
+        setup_package("_Async")
+        yield 500
+
+    def tearDown(self):
+        cleanup_package("_Success")
+        cleanup_package("_Failure")
+        cleanup_package("_Empty")
+        cleanup_package("_Output")
+        cleanup_package("_Deferred")
+        cleanup_package("_Async")
+
+    @test_package("_Success")
     def test_success(self, txt):
         self.assertOk(txt)
 
-    @prepare_package("_Failure")
+    @test_package("_Failure")
     def test_failure(self, txt):
         self.assertRegexContains(txt, r'^FAILED \(failures=1\)')
 
-    @prepare_package("_Error")
+    @test_package("_Error")
     def test_error(self, txt):
         self.assertRegexContains(txt, r'^ERROR')
 
-    @prepare_package("_Empty")
+    @test_package("_Empty")
     def test_empty(self, txt):
         self.assertRegexContains(txt, r'^No tests are found.')
 
-    @prepare_package("_Output", "tests/result")
+    @test_package("_Output", "tests/result")
     def test_output(self, txt):
         self.assertOk(txt)
 
-    @prepare_package("_Deferred")
+    @test_package("_Deferred")
     def test_deferred(self, txt):
         self.assertOk(txt)
 
-    @prepare_package("_Async")
+    @test_package("_Async")
     def test_async(self, txt):
         self.assertOk(txt)
 
 
 class TestSyntax(UnitTestingTestCase):
 
-    @prepare_package("_Syntax_Failure", syntax_test=True, delay=500)
+    def setUp(self):
+        setup_package("_Syntax_Failure")
+        setup_package("_Syntax_Success")
+        setup_package("_Syntax_Compat_Failure")
+        setup_package("_Syntax_Compat_Success")
+        yield 500
+
+    def tearDown(self):
+        cleanup_package("_Syntax_Failure")
+        cleanup_package("_Syntax_Success")
+        cleanup_package("_Syntax_Compat_Failure")
+        cleanup_package("_Syntax_Compat_Success")
+
+    @test_package("_Syntax_Failure", syntax_test=True)
     def test_fail_syntax(self, txt):
         self.assertRegexContains(txt, r'^FAILED: 1 of 21 assertions in 1 file failed$')
 
-    @prepare_package("_Syntax_Success", syntax_test=True, delay=500)
+    @test_package("_Syntax_Success", syntax_test=True)
     def test_success_syntax(self, txt):
         self.assertOk(txt)
 
-    @prepare_package("_Syntax_Error", syntax_test=True, delay=500)
+    @test_package("_Syntax_Error", syntax_test=True)
     def test_error_syntax(self, txt):
         self.assertRegexContains(txt, r'^ERROR: No syntax_test')
 
-    @prepare_package("_Syntax_Compat_Failure", syntax_compatibility=True, delay=500)
+    @test_package("_Syntax_Compat_Failure", syntax_compatibility=True)
     def test_fail_syntax_compatibility(self, txt):
         self.assertRegexContains(txt, r'^FAILED: 3 errors in 1 of 1 syntax$')
 
-    @prepare_package("_Syntax_Compat_Success", syntax_compatibility=True, delay=500)
+    @test_package("_Syntax_Compat_Success", syntax_compatibility=True)
     def test_success_syntax_compatibility(self, txt):
         self.assertOk(txt)
 
@@ -173,13 +200,23 @@ def has_colorschemeunit():
 
 
 class TestColorScheme(UnitTestingTestCase):
+
+    def setUp(self):
+        setup_package("_ColorScheme_Failure")
+        setup_package("_ColorScheme_Success")
+        yield 500
+
+    def tearDown(self):
+        cleanup_package("_ColorScheme_Failure")
+        cleanup_package("_ColorScheme_Success")
+
     @skipIf(not has_colorschemeunit(), "ColorSchemeUnit is not installed")
-    @prepare_package("_ColorScheme_Failure", color_scheme_test=True)
+    @test_package("_ColorScheme_Failure", color_scheme_test=True)
     def test_fail_color_scheme(self, txt):
         self.assertRegexContains(txt, r'^There were 14 failures:$')
 
     @skipIf(not has_colorschemeunit(), "ColorSchemeUnit is not installed")
-    @prepare_package("_ColorScheme_Success", color_scheme_test=True)
+    @test_package("_ColorScheme_Success", color_scheme_test=True)
     def test_success_color_scheme(self, txt):
         self.assertOk(txt)
 
@@ -191,9 +228,10 @@ def tidy_path(path):
 class TestTempDirectoryTestCase(TempDirectoryTestCase):
 
     def test_temp_dir(self):
-        self.assertTrue(tidy_path(
-            self._temp_dir),
-            tidy_path(self.window.folders()[0]))
+        self.assertTrue(
+            tidy_path(self._temp_dir),
+            tidy_path(self.window.folders()[0])
+        )
 
 
 class TestViewTestCase(ViewTestCase):