Remove "__main__" checks from tests

Tests are run with "python -m unittest py2app_tests/test_xxx.py", which means the "if __name__ == '__main__'" block at the end is not necessary. Also remove alternate imports in a number of test files.
ronaldoussoren · Apr 10, 2022 · 9d0c3a0 · 9d0c3a0
1 parent 03bc5ab
commit 9d0c3a0
Show file tree

Hide file tree

Showing 21 changed files with 11 additions and 145 deletions.
diff --git a/py2app_tests/test_app_resources.py b/py2app_tests/test_app_resources.py
@@ -8,10 +8,7 @@
 
 import py2app
 
-if __name__ == "__main__":
-    from tools import kill_child_processes
-else:
-    from .tools import kill_child_processes
+from .tools import kill_child_processes
 
 DIR_NAME = os.path.dirname(os.path.abspath(__file__))
 
@@ -30,7 +27,6 @@ def setUpClass(cls):
 
         env = os.environ.copy()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
-        env["TMPDIR"] = os.getcwd()
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
         else:
@@ -160,7 +156,3 @@ class TestBasicSemiStandaloneApp(TestBasicApp):
     py2app_args = [
         "--semi-standalone",
     ]
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_app_with_ctypes.py b/py2app_tests/test_app_with_ctypes.py
@@ -28,7 +28,6 @@ def setUpClass(cls):
         kill_child_processes()
 
         env = os.environ.copy()
-        env["TMPDIR"] = os.getcwd()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
@@ -294,7 +293,3 @@ class TestBasicSemiStandaloneAppWithCTypes(TestBasicAppWithCTypes):
     py2app_args = [
         "--semi-standalone",
     ]
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_app_with_scripts.py b/py2app_tests/test_app_with_scripts.py
@@ -27,10 +27,7 @@
 
 import py2app
 
-if __name__ == "__main__":
-    from tools import kill_child_processes
-else:
-    from .tools import kill_child_processes
+from .tools import kill_child_processes
 
 DIR_NAME = os.path.dirname(os.path.abspath(__file__))
 
@@ -72,7 +69,6 @@ def setUpClass(cls):
         cls.class_cleanup()
 
         env = os.environ.copy()
-        env["TMPDIR"] = os.getcwd()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
@@ -398,7 +394,3 @@ def test_is_optimized(self):
             p.wait()
 
         self.assertChecksumsSame()
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_app_with_sharedlib.py b/py2app_tests/test_app_with_sharedlib.py
@@ -30,7 +30,6 @@ def setUpClass(cls):
 
         env = os.environ.copy()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
-        env["TMPDIR"] = os.getcwd()
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
         else:
@@ -267,7 +266,3 @@ class TestBasicSemiStandaloneAppWithExtension(TestBasicAppWithExtension):
     py2app_args = [
         "--semi-standalone",
     ]
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_argv_emulation.py b/py2app_tests/test_argv_emulation.py
@@ -12,10 +12,7 @@
 
 import py2app
 
-if __name__ == "__main__":
-    from tools import kill_child_processes
-else:
-    from .tools import kill_child_processes
+from .tools import kill_child_processes
 
 DIR_NAME = os.path.dirname(os.path.abspath(__file__))
 
@@ -36,7 +33,6 @@ def setUpClass(cls):
 
         env = os.environ.copy()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
-        env["TMPDIR"] = os.getcwd()
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
         else:
@@ -202,7 +198,3 @@ class TestArgvEmulationWithURL(TestArgvEmulation):
     setup_file = "setup-with-urlscheme.py"
     open_argument = "myurl:mycommand"
     app_dir = os.path.join(DIR_NAME, "argv_app")
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_basic_app.py b/py2app_tests/test_basic_app.py
@@ -69,7 +69,6 @@ def setUpClass(cls):
 
         env = os.environ.copy()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
-        env["TMPDIR"] = os.getcwd()
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
         else:
@@ -454,7 +453,3 @@ def test_is_optimized(self):
             self.assertEqual(status, 0)
 
         self.assertChecksumsSame()
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_basic_app_with_encoding.py b/py2app_tests/test_basic_app_with_encoding.py
@@ -27,10 +27,7 @@
 
 import py2app
 
-if __name__ == "__main__":
-    from tools import kill_child_processes
-else:
-    from .tools import kill_child_processes
+from .tools import kill_child_processes
 
 DIR_NAME = os.path.dirname(os.path.abspath(__file__))
 
@@ -72,7 +69,6 @@ def setUpClass(cls):
 
         env = os.environ.copy()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
-        env["TMPDIR"] = os.getcwd()
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
         else:
@@ -274,7 +270,3 @@ def test_email_not_included(self):
         )
         if os.path.exists(os.path.join(path, "email")):
             self.fail("'email' package copied into a semi-standalone build")
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_basic_app_with_plugin.py b/py2app_tests/test_basic_app_with_plugin.py
@@ -49,7 +49,6 @@ def setUpClass(cls):
         kill_child_processes()
 
         env = os.environ.copy()
-        env["TMPDIR"] = os.getcwd()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
@@ -151,7 +150,3 @@ class TestBasicSemiStandaloneAppWithPlugins(TestBasicAppWithPlugins):
     py2app_args = [
         "--semi-standalone",
     ]
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_basic_plugin.py b/py2app_tests/test_basic_plugin.py
@@ -41,7 +41,6 @@ def setUpClass(cls):
             cmd = [sys.executable, "setup.py", "py2app"] + cls.py2app_args
 
             env = os.environ.copy()
-            env["TMPDIR"] = os.getcwd()
             pp = os.path.dirname(os.path.dirname(py2app.__file__))
             if "PYTHONPATH" in env:
                 env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
@@ -257,7 +256,3 @@ class TestBasicAliasPluginUnicodePath(TestBasicPluginUnicodePath):
 
 class TestBasicSemiStandalonePluginUnicodePath(TestBasicPluginUnicodePath):
     py2app_args = ["--semi-standalone"]
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_compile_resources.py b/py2app_tests/test_compile_resources.py
@@ -7,10 +7,7 @@
 
 import py2app
 
-if __name__ == "__main__":
-    from tools import kill_child_processes
-else:
-    from .tools import kill_child_processes
+from .tools import kill_child_processes
 
 DIR_NAME = os.path.dirname(os.path.abspath(__file__))
 
@@ -29,7 +26,6 @@ def setUpClass(cls):
 
         env = os.environ.copy()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
-        env["TMPDIR"] = os.getcwd()
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
         else:
@@ -95,7 +91,3 @@ class TestBasicSemiStandaloneApp(TestBasicApp):
     py2app_args = [
         "--semi-standalone",
     ]
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_email_pkg.py b/py2app_tests/test_email_pkg.py
@@ -9,10 +9,7 @@
 
 import py2app
 
-if __name__ == "__main__":
-    from tools import kill_child_processes
-else:
-    from .tools import kill_child_processes
+from .tools import kill_child_processes
 
 DIR_NAME = os.path.dirname(os.path.abspath(__file__))
 
@@ -139,7 +136,3 @@ class TestEmailFull(TestEmailCompat):
 
 class TestEmailPlainImport(TestEmailCompat):
     setup_file = "setup-plain.py"
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_explicit_includes.py b/py2app_tests/test_explicit_includes.py
@@ -8,10 +8,7 @@
 
 import py2app
 
-if __name__ == "__main__":
-    from tools import kill_child_processes
-else:
-    from .tools import kill_child_processes
+from .tools import kill_child_processes
 
 DIR_NAME = os.path.dirname(os.path.abspath(__file__))
 
@@ -31,7 +28,6 @@ def setUpClass(cls):
         kill_child_processes()
 
         env = os.environ.copy()
-        env["TMPDIR"] = os.getcwd()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
@@ -114,7 +110,3 @@ def test_simple_imports(self):
         p.stdin.flush()
         ln = p.stdout.readline()
         self.assertEqual(ln.strip(), b"package3.mod")
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_filters.py b/py2app_tests/test_filters.py
@@ -60,7 +60,3 @@ def test_bundle_or_dylib_filter(self):
 
         node.filetype = "dylib"
         self.assertTrue(filters.bundle_or_dylib_filter(node))
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_lsenvironment.py b/py2app_tests/test_lsenvironment.py
@@ -32,7 +32,6 @@ def setUpClass(cls):
         kill_child_processes()
 
         env = os.environ.copy()
-        env["TMPDIR"] = os.getcwd()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
@@ -107,7 +106,3 @@ def test_basic_start(self):
         self.assertEqual(env["EXTRA_VAR"], "hello world")
         self.assertEqual(env["LANG"], "nl_NL.latin1")
         self.assertEqual(env["LC_CTYPE"], "nl_NL.UTF-8")
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_package_data.py b/py2app_tests/test_package_data.py
@@ -16,10 +16,7 @@
 
 import py2app
 
-if __name__ == "__main__":
-    from tools import kill_child_processes
-else:
-    from .tools import kill_child_processes
+from .tools import kill_child_processes
 
 DIR_NAME = os.path.dirname(os.path.abspath(__file__))
 
@@ -62,7 +59,6 @@ def setUpClass(cls):
         kill_child_processes()
 
         env = os.environ.copy()
-        env["TMPDIR"] = os.getcwd()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
@@ -191,7 +187,3 @@ class TestExplicitIncludesWithSubPackage(TestExplicitIncludes):
 
 class TestExplicitIncludesWithSubPackageSemiStandalone(TestExplicitIncludes):
     py2app_args = ["--packages=package2.sub", "--semi-standalone"]
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_pkg_script.py b/py2app_tests/test_pkg_script.py
@@ -32,7 +32,6 @@ def setUpClass(cls):
         kill_child_processes()
 
         env = os.environ.copy()
-        env["TMPDIR"] = os.getcwd()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
@@ -192,7 +191,3 @@ class TestBasicSemiStandaloneApp(TestBasicApp):
     py2app_args = [
         "--semi-standalone",
     ]
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_plugin_with_scripts.py b/py2app_tests/test_plugin_with_scripts.py
@@ -11,10 +11,7 @@
 
 import py2app
 
-if __name__ == "__main__":
-    from tools import kill_child_processes
-else:
-    from .tools import kill_child_processes
+from .tools import kill_child_processes
 
 DIR_NAME = os.path.dirname(os.path.abspath(__file__))
 
@@ -39,7 +36,6 @@ def setUpClass(cls):
             cmd = [sys.executable, "setup.py", "py2app"] + cls.py2app_args
 
             env = os.environ.copy()
-            env["TMPDIR"] = os.getcwd()
             pp = os.path.dirname(os.path.dirname(py2app.__file__))
             if "PYTHONPATH" in env:
                 env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
@@ -257,7 +253,3 @@ class TestBasicAliasPluginUnicodePath(TestBasicPluginUnicodePath):
 
 class TestBasicSemiStandalonePluginUnicodePath(TestBasicPluginUnicodePath):
     py2app_args = ["--semi-standalone"]
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_py2applet.py b/py2app_tests/test_py2applet.py
@@ -7,10 +7,7 @@
 import py2app
 from py2app import script_py2applet
 
-if __name__ == "__main__":
-    from tools import kill_child_processes
-else:
-    from .tools import kill_child_processes
+from .tools import kill_child_processes
 
 
 class TestPy2Applet(unittest.TestCase):
@@ -24,7 +21,6 @@ def tearDown(self):
 
     def run_py2applet(self, *args):
         env = os.environ.copy()
-        env["TMPDIR"] = os.getcwd()
         pp = os.path.dirname(os.path.dirname(py2app.__file__))
         if "PYTHONPATH" in env:
             env["PYTHONPATH"] = pp + ":" + env["PYTHONPATH"]
@@ -61,7 +57,3 @@ def test_generate_setup(self):
         fp.close()
 
         self.assertTrue("APP = ['foo.py']" in contents)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/py2app_tests/test_recipe_imports.py b/py2app_tests/test_recipe_imports.py
@@ -37,7 +37,3 @@ def test_imports(self):
             else:
 
                 self.fail(f"Can import {mod!r}")
-
-
-if __name__ == "__main__":
-    unittest.main()