Automatically run test files with pytest (#9576)

* Switch to pytest

git grep -l unittest.main | xargs sed -i 's/unittest.main()/sys.exit(pytest.main([__file__]))/g'
git ls-files -m | xargs -I {} sh -c "echo 'import sys\nimport pytest' >> '{}'"
isort --float-to-top .

* add pytest dep

* use sys.argv

certbot-apache/setup.py

@@ -17,6 +17,10 @@ dev_extras = [
     'apacheconfig>=0.3.2',
 ]
 
+test_extras = [
+    'pytest',
+]
+
 setup(
     name='certbot-apache',
     version=version,
@@ -52,6 +56,7 @@ setup(
     install_requires=install_requires,
     extras_require={
         'dev': dev_extras,
+        'test': test_extras,
     },
     entry_points={
         'certbot.plugins': [

certbot-apache/tests/autohsts_test.py

@@ -1,9 +1,12 @@
 # pylint: disable=too-many-lines
 """Test for certbot_apache._internal.configurator AutoHSTS functionality"""
 import re
+import sys
 import unittest
 from unittest import mock
 
+import pytest
+
 from certbot import errors
 from certbot_apache._internal import constants
 import util
@@ -180,4 +183,4 @@ class AutoHSTSTest(util.ApacheTest):
 
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/centos_test.py

@@ -1,7 +1,10 @@
 """Test for certbot_apache._internal.configurator for Centos overrides"""
+import sys
 import unittest
 from unittest import mock
 
+import pytest
+
 from certbot import errors
 from certbot.compat import filesystem
 from certbot.compat import os
@@ -238,4 +241,4 @@ class MultipleVhostsTestCentOS(util.ApacheTest):
 
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/complex_parsing_test.py

@@ -1,7 +1,10 @@
 """Tests for certbot_apache._internal.parser."""
 import shutil
+import sys
 import unittest
 
+import pytest
+
 from certbot import errors
 from certbot.compat import os
 import util
@@ -124,4 +127,4 @@ class ComplexParserTest(util.ParserTest):
 
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/configurator_reverter_test.py

@@ -1,8 +1,11 @@
 """Test for certbot_apache._internal.configurator implementations of reverter"""
 import shutil
+import sys
 import unittest
 from unittest import mock
 
+import pytest
+
 from certbot import errors
 import util
 
@@ -73,4 +76,4 @@ class ConfiguratorReverterTest(util.ApacheTest):
 
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/configurator_test.py

@@ -3,10 +3,13 @@
 import copy
 import shutil
 import socket
+import sys
 import tempfile
 import unittest
 from unittest import mock
 
+import pytest
+
 from acme import challenges
 from certbot import achallenges
 from certbot import crypto_util
@@ -1773,4 +1776,4 @@ class InstallSslOptionsConfTest(util.ApacheTest):
             self.assertEqual(self.config._open_module_file("/nonsense/"), "testing 12 3")
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/debian_test.py

@@ -1,8 +1,11 @@
 """Test for certbot_apache._internal.configurator for Debian overrides"""
 import shutil
+import sys
 import unittest
 from unittest import mock
 
+import pytest
+
 from certbot import errors
 from certbot.compat import os
 from certbot.tests import util as certbot_util
@@ -211,4 +214,4 @@ class MultipleVhostsTestDebian(util.ApacheTest):
             errors.MisconfigurationError, self.config.enable_mod, "ssl")
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/display_ops_test.py

@@ -1,7 +1,10 @@
 """Test certbot_apache._internal.display_ops."""
+import sys
 import unittest
 from unittest import mock
 
+import pytest
+
 from certbot import errors
 from certbot.display import util as display_util
 from certbot.tests import util as certbot_util
@@ -100,4 +103,4 @@ class SelectVhostTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/entrypoint_test.py

@@ -1,7 +1,10 @@
 """Test for certbot_apache._internal.entrypoint for override class resolution"""
+import sys
 import unittest
 from unittest import mock
 
+import pytest
+
 from certbot_apache._internal import configurator
 from certbot_apache._internal import entrypoint
 
@@ -43,4 +46,4 @@ class EntryPointTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/fedora_test.py

@@ -1,7 +1,10 @@
 """Test for certbot_apache._internal.configurator for Fedora 29+ overrides"""
+import sys
 import unittest
 from unittest import mock
 
+import pytest
+
 from certbot import errors
 from certbot.compat import filesystem
 from certbot.compat import os
@@ -190,4 +193,4 @@ class MultipleVhostsTestFedora(util.ApacheTest):
 
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/gentoo_test.py

@@ -1,7 +1,10 @@
 """Test for certbot_apache._internal.configurator for Gentoo overrides"""
+import sys
 import unittest
 from unittest import mock
 
+import pytest
+
 from certbot import errors
 from certbot.compat import filesystem
 from certbot.compat import os
@@ -133,4 +136,4 @@ class MultipleVhostsTestGentoo(util.ApacheTest):
         self.assertEqual(mock_run_script.call_count, 3)
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/http_01_test.py

@@ -1,9 +1,12 @@
 """Test for certbot_apache._internal.http_01."""
 import errno
+import sys
 from typing import List
 import unittest
 from unittest import mock
 
+import pytest
+
 from acme import challenges
 from certbot import achallenges
 from certbot import errors
@@ -220,4 +223,4 @@ class ApacheHttp01Test(util.ApacheTest):
 
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/obj_test.py

@@ -1,6 +1,9 @@
 """Tests for certbot_apache._internal.obj."""
+import sys
 import unittest
 
+import pytest
+
 
 class VirtualHostTest(unittest.TestCase):
     """Test the VirtualHost class."""
@@ -137,4 +140,4 @@ class AddrTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/parser_test.py

@@ -1,8 +1,11 @@
 """Tests for certbot_apache._internal.parser."""
 import shutil
+import sys
 import unittest
 from unittest import mock
 
+import pytest
+
 from certbot import errors
 from certbot.compat import os
 import util
@@ -400,4 +403,4 @@ class ParserInitTest(util.ApacheTest):
 
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/parsernode_configurator_test.py

@@ -1,7 +1,10 @@
 """Tests for ApacheConfigurator for AugeasParserNode classes"""
+import sys
 import unittest
 from unittest import mock
 
+import pytest
+
 import util
 
 try:
@@ -40,4 +43,4 @@ class ConfiguratorParserNodeTest(util.ApacheTest):  # pylint: disable=too-many-p
 
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/parsernode_test.py

@@ -1,7 +1,10 @@
 """ Tests for ParserNode interface """
 
+import sys
 import unittest
 
+import pytest
+
 from certbot_apache._internal import interfaces
 from certbot_apache._internal import parsernode_util as util
 
@@ -125,4 +128,4 @@ class ParserNodeTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover

certbot-apache/tests/parsernode_util_test.py

@@ -1,6 +1,9 @@
 """ Tests for ParserNode utils """
+import sys
 import unittest
 
+import pytest
+
 from certbot_apache._internal import parsernode_util as util
 
 
@@ -112,4 +115,4 @@ class ParserNodeUtilTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()  # pragma: no cover
+    sys.exit(pytest.main(sys.argv[1:] + [__file__]))  # pragma: no cover