Refactor tests out of packaged module for apache plugin

certbot-apache/MANIFEST.in

@@ -1,6 +1,6 @@
 include LICENSE.txt
 include README.rst
-recursive-include certbot_apache/tests/testdata *
+recursive-include tests *
 include certbot_apache/_internal/centos-options-ssl-apache.conf
 include certbot_apache/_internal/options-ssl-apache.conf
 recursive-include certbot_apache/_internal/augeas_lens *.aug

certbot-apache/certbot_apache/tests/__init__.py

@@ -1 +0,0 @@
-"""Certbot Apache Tests"""

certbot-apache/tests/autohsts_test.py

@@ -8,7 +8,8 @@ import six  # pylint: disable=unused-import
 
 from certbot import errors
 from certbot_apache._internal import constants
-from certbot_apache.tests import util
+
+import util
 
 
 class AutoHSTSTest(util.ApacheTest):

certbot-apache/tests/centos6_test.py

@@ -7,7 +7,8 @@ from certbot.errors import MisconfigurationError
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_centos
 from certbot_apache._internal import parser
-from certbot_apache.tests import util
+
+import util
 
 
 def get_vh_truth(temp_dir, config_name):

certbot-apache/tests/centos_test.py

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

certbot-apache/tests/complex_parsing_test.py

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

certbot-apache/tests/configurator_reverter_test.py

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

certbot-apache/tests/configurator_test.py

@@ -24,7 +24,8 @@ 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
-from certbot_apache.tests import util
+
+import util
 
 
 class MultipleVhostsTest(util.ApacheTest):

certbot-apache/tests/debian_test.py

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

certbot-apache/tests/display_ops_test.py

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

certbot-apache/tests/fedora_test.py

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

certbot-apache/tests/gentoo_test.py

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

certbot-apache/tests/http_01_test.py

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

certbot-apache/tests/parser_test.py

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