Make apache tests internal (#9637)

This is the certbot-apache version of #9625.

certbot-apache/MANIFEST.in

@@ -1,8 +1,8 @@
 include LICENSE.txt
 include README.rst
-recursive-include tests *
 recursive-include certbot_apache/_internal/augeas_lens *.aug
 recursive-include certbot_apache/_internal/tls_configs *.conf
+recursive-include certbot_apache/_internal/tests/testdata *
 include certbot_apache/py.typed
 global-exclude __pycache__
 global-exclude *.py[cod]

certbot-apache/certbot_apache/_internal/tests/__init__.py

@@ -0,0 +1 @@
+"""certbot-apache tests"""

certbot-apache/certbot_apache/_internal/tests/augeasnode_test.py

@@ -3,11 +3,12 @@ import os
 from typing import List
 from unittest import mock
 
+import pytest
+
 from certbot import errors
 from certbot_apache._internal import assertions
 from certbot_apache._internal import augeasparser
-import util
-import pytest
+from certbot_apache._internal.tests import util
 
 
 def _get_augeasnode_mock(filepath):

certbot-apache/certbot_apache/_internal/tests/autohsts_test.py

@@ -9,7 +9,7 @@ import pytest
 
 from certbot import errors
 from certbot_apache._internal import constants
-import util
+from certbot_apache._internal.tests import util
 
 
 class AutoHSTSTest(util.ApacheTest):

certbot-apache/certbot_apache/_internal/tests/centos_test.py

@@ -10,7 +10,7 @@ from certbot.compat import filesystem
 from certbot.compat import os
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_centos
-import util
+from certbot_apache._internal.tests import util
 
 
 def get_vh_truth(temp_dir, config_name):

certbot-apache/certbot_apache/_internal/tests/complex_parsing_test.py

@@ -7,7 +7,7 @@ import pytest
 
 from certbot import errors
 from certbot.compat import os
-import util
+from certbot_apache._internal.tests import util
 
 
 class ComplexParserTest(util.ParserTest):

certbot-apache/certbot_apache/_internal/tests/configurator_reverter_test.py

@@ -7,7 +7,7 @@ from unittest import mock
 import pytest
 
 from certbot import errors
-import util
+from certbot_apache._internal.tests import util
 
 
 class ConfiguratorReverterTest(util.ApacheTest):

certbot-apache/certbot_apache/_internal/tests/configurator_test.py

@@ -22,7 +22,7 @@ from certbot_apache._internal import apache_util
 from certbot_apache._internal import constants
 from certbot_apache._internal import obj
 from certbot_apache._internal import parser
-import util
+from certbot_apache._internal.tests import util
 
 
 class MultipleVhostsTest(util.ApacheTest):

certbot-apache/certbot_apache/_internal/tests/debian_test.py

@@ -11,7 +11,7 @@ from certbot.compat import os
 from certbot.tests import util as certbot_util
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import obj
-import util
+from certbot_apache._internal.tests import util
 
 
 class MultipleVhostsTestDebian(util.ApacheTest):

certbot-apache/certbot_apache/_internal/tests/display_ops_test.py

@@ -10,7 +10,7 @@ from certbot.display import util as display_util
 from certbot.tests import util as certbot_util
 from certbot_apache._internal import obj
 from certbot_apache._internal.display_ops import select_vhost_multiple
-import util
+from certbot_apache._internal.tests import util
 
 
 class SelectVhostMultiTest(unittest.TestCase):

certbot-apache/certbot_apache/_internal/tests/fedora_test.py

@@ -10,7 +10,7 @@ from certbot.compat import filesystem
 from certbot.compat import os
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_fedora
-import util
+from certbot_apache._internal.tests import util
 
 
 def get_vh_truth(temp_dir, config_name):

certbot-apache/certbot_apache/_internal/tests/gentoo_test.py

@@ -10,7 +10,7 @@ from certbot.compat import filesystem
 from certbot.compat import os
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_gentoo
-import util
+from certbot_apache._internal.tests import util
 
 
 def get_vh_truth(temp_dir, config_name):

certbot-apache/certbot_apache/_internal/tests/http_01_test.py

@@ -14,7 +14,7 @@ from certbot.compat import filesystem
 from certbot.compat import os
 from certbot.tests import acme_util
 from certbot_apache._internal.parser import get_aug_path
-import util
+from certbot_apache._internal.tests import util
 
 NUM_ACHALLS = 3
 

certbot-apache/certbot_apache/_internal/tests/parser_test.py

@@ -8,7 +8,7 @@ import pytest
 
 from certbot import errors
 from certbot.compat import os
-import util
+from certbot_apache._internal.tests import util
 
 
 class BasicParserTest(util.ParserTest):

certbot-apache/certbot_apache/_internal/tests/parsernode_configurator_test.py

@@ -5,7 +5,7 @@ from unittest import mock
 
 import pytest
 
-import util
+from certbot_apache._internal.tests import util
 
 try:
     import apacheconfig