WIP setup/teardown

Author: deathaxe

tests/test_3141596.py

@@ -43,7 +43,7 @@ def wrapper(func):
         @wraps(func)
         def real_wrapper(self):
             packages_path = sublime.packages_path()
-            set_package(packages_path, package)
+            # set_package(packages_path, package)
 
             if output:
                 # set by _Output/unittesting.json
@@ -89,7 +89,7 @@ def condition():
             if isiterable(deferred):
                 yield from deferred
 
-            cleanup_package(packages_path, package)
+            # cleanup_package(packages_path, package)
 
             yield
 
@@ -112,6 +112,27 @@ def assertOk(self, txt, msg=None):
 
 class TestUnitTesting(UnitTestingTestCase):
 
+    def setUp(self):
+        packages_path = sublime.packages_path()
+        set_package(packages_path, "_Success")
+        set_package(packages_path, "_Failure")
+        set_package(packages_path, "_Error")
+        set_package(packages_path, "_Empty")
+        set_package(packages_path, "_Output")
+        set_package(packages_path, "_Deferred")
+        set_package(packages_path, "_Async")
+        yield 500
+
+    def tearDown(self):
+        packages_path = sublime.packages_path()
+        cleanup_package(packages_path, "_Success")
+        cleanup_package(packages_path, "_Failure")
+        cleanup_package(packages_path, "_Error")
+        cleanup_package(packages_path, "_Empty")
+        cleanup_package(packages_path, "_Output")
+        cleanup_package(packages_path, "_Deferred")
+        cleanup_package(packages_path, "_Async")
+
     @prepare_package("_Success")
     def test_success(self, txt):
         self.assertOk(txt)
@@ -143,23 +164,40 @@ def test_async(self, txt):
 
 class TestSyntax(UnitTestingTestCase):
 
-    @prepare_package("_Syntax_Failure", syntax_test=True, delay=500)
+    def setUp(self):
+        packages_path = sublime.packages_path()
+        set_package(packages_path, "_Syntax_Failure")
+        set_package(packages_path, "_Syntax_Success")
+        set_package(packages_path, "_Syntax_Error")
+        set_package(packages_path, "_Syntax_Compat_Failure")
+        set_package(packages_path, "_Syntax_Compat_Success")
+        yield 500
+
+    def tearDown(self):
+        packages_path = sublime.packages_path()
+        cleanup_package(packages_path, "_Syntax_Failure")
+        cleanup_package(packages_path, "_Syntax_Success")
+        cleanup_package(packages_path, "_Syntax_Error")
+        cleanup_package(packages_path, "_Syntax_Compat_Failure")
+        cleanup_package(packages_path, "_Syntax_Compat_Success")
+
+    @prepare_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)
+    @prepare_package("_Syntax_Success", syntax_test=True)
     def test_success_syntax(self, txt):
         self.assertOk(txt)
 
-    @prepare_package("_Syntax_Error", syntax_test=True, delay=500)
+    @prepare_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)
+    @prepare_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)
+    @prepare_package("_Syntax_Compat_Success", syntax_compatibility=True)
     def test_success_syntax_compatibility(self, txt):
         self.assertOk(txt)
 
@@ -172,16 +210,16 @@ def has_colorschemeunit():
     return False
 
 
-class TestColorScheme(UnitTestingTestCase):
-    @skipIf(not has_colorschemeunit(), "ColorSchemeUnit is not installed")
-    @prepare_package("_ColorScheme_Failure", color_scheme_test=True)
-    def test_fail_color_scheme(self, txt):
-        self.assertRegexContains(txt, r'^There were 14 failures:$')
+# class TestColorScheme(UnitTestingTestCase):
+#     @skipIf(not has_colorschemeunit(), "ColorSchemeUnit is not installed")
+#     @prepare_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)
-    def test_success_color_scheme(self, txt):
-        self.assertOk(txt)
+#     @skipIf(not has_colorschemeunit(), "ColorSchemeUnit is not installed")
+#     @prepare_package("_ColorScheme_Success", color_scheme_test=True)
+#     def test_success_color_scheme(self, txt):
+#         self.assertOk(txt)
 
 
 def tidy_path(path):