make tests internal (#9638)

This is the certbot-nginx version of #9625.
certbot · Mar 28, 2023 · 9e30e8a · 9e30e8a
1 parent ed6bbde
commit 9e30e8a
Show file tree

Hide file tree

Showing 46 changed files with 7 additions and 6 deletions.
diff --git a/certbot-nginx/MANIFEST.in b/certbot-nginx/MANIFEST.in
@@ -1,7 +1,7 @@
 include LICENSE.txt
 include README.rst
-recursive-include tests *
 recursive-include certbot_nginx/_internal/tls_configs *.conf
+recursive-include certbot_nginx/_internal/tests/testdata *
 include certbot_nginx/py.typed
 global-exclude __pycache__
 global-exclude *.py[cod]
diff --git a/certbot-nginx/certbot_nginx/_internal/tests/__init__.py b/certbot-nginx/certbot_nginx/_internal/tests/__init__.py
@@ -0,0 +1 @@
+"""certbot-nginx tests"""
diff --git a/...t-nginx/tests/boulder-integration.conf.sh → ...nternal/tests/boulder-integration.conf.sh b/...t-nginx/tests/boulder-integration.conf.sh → ...nternal/tests/boulder-integration.conf.sh
diff --git a/certbot-nginx/tests/configurator_test.py → ...ginx/_internal/tests/configurator_test.py b/certbot-nginx/tests/configurator_test.py → ...ginx/_internal/tests/configurator_test.py
@@ -17,7 +17,7 @@
 from certbot_nginx._internal import parser
 from certbot_nginx._internal.configurator import _redirect_block_for_domain
 from certbot_nginx._internal.nginxparser import UnspacedList
-import test_util as util
+from certbot_nginx._internal.tests import test_util as util
 
 
 class NginxConfiguratorTest(util.NginxTest):

diff --git a/certbot-nginx/tests/display_ops_test.py → ...nginx/_internal/tests/display_ops_test.py b/certbot-nginx/tests/display_ops_test.py → ...nginx/_internal/tests/display_ops_test.py
@@ -8,7 +8,7 @@
 from certbot.tests import util as certbot_util
 from certbot_nginx._internal import parser
 from certbot_nginx._internal.display_ops import select_vhost_multiple
-import test_util as util
+from certbot_nginx._internal.tests import test_util as util
 
 
 class SelectVhostMultiTest(util.NginxTest):

diff --git a/certbot-nginx/tests/http_01_test.py → ...bot_nginx/_internal/tests/http_01_test.py b/certbot-nginx/tests/http_01_test.py → ...bot_nginx/_internal/tests/http_01_test.py
@@ -11,7 +11,7 @@
 from certbot.tests import acme_util
 from certbot.tests import util as test_util
 from certbot_nginx._internal.obj import Addr
-import test_util as util
+from certbot_nginx._internal.tests import test_util as util
 
 AUTH_KEY = jose.JWKRSA.load(test_util.load_vector("rsa512_key.pem"))
 

diff --git a/certbot-nginx/tests/nginxparser_test.py → ...nginx/_internal/tests/nginxparser_test.py b/certbot-nginx/tests/nginxparser_test.py → ...nginx/_internal/tests/nginxparser_test.py
@@ -14,7 +14,7 @@
 from certbot_nginx._internal.nginxparser import loads
 from certbot_nginx._internal.nginxparser import RawNginxParser
 from certbot_nginx._internal.nginxparser import UnspacedList
-import test_util as util
+from certbot_nginx._internal.tests import test_util as util
 
 FIRST = operator.itemgetter(0)
 

diff --git a/certbot-nginx/tests/obj_test.py → ...certbot_nginx/_internal/tests/obj_test.py b/certbot-nginx/tests/obj_test.py → ...certbot_nginx/_internal/tests/obj_test.py
diff --git a/certbot-nginx/tests/parser_obj_test.py → ..._nginx/_internal/tests/parser_obj_test.py b/certbot-nginx/tests/parser_obj_test.py → ..._nginx/_internal/tests/parser_obj_test.py
diff --git a/certbot-nginx/tests/parser_test.py → ...tbot_nginx/_internal/tests/parser_test.py b/certbot-nginx/tests/parser_test.py → ...tbot_nginx/_internal/tests/parser_test.py
@@ -12,7 +12,7 @@
 from certbot_nginx._internal import nginxparser
 from certbot_nginx._internal import obj
 from certbot_nginx._internal import parser
-import test_util as util
+from certbot_nginx._internal.tests import test_util as util
 
 
 class NginxParserTest(util.NginxTest):

diff --git a/certbot-nginx/tests/test_util.py → ...ertbot_nginx/_internal/tests/test_util.py b/certbot-nginx/tests/test_util.py → ...ertbot_nginx/_internal/tests/test_util.py
diff --git a/...ginx/tests/testdata/etc_nginx/broken.conf → ...rnal/tests/testdata/etc_nginx/broken.conf b/...ginx/tests/testdata/etc_nginx/broken.conf → ...rnal/tests/testdata/etc_nginx/broken.conf
diff --git a/...s/testdata/etc_nginx/comment_in_file.conf → ...s/testdata/etc_nginx/comment_in_file.conf b/...s/testdata/etc_nginx/comment_in_file.conf → ...s/testdata/etc_nginx/comment_in_file.conf
diff --git a/.../tests/testdata/etc_nginx/edge_cases.conf → .../tests/testdata/etc_nginx/edge_cases.conf b/.../tests/testdata/etc_nginx/edge_cases.conf → .../tests/testdata/etc_nginx/edge_cases.conf
diff --git a/...t-nginx/tests/testdata/etc_nginx/foo.conf → ...nternal/tests/testdata/etc_nginx/foo.conf b/...t-nginx/tests/testdata/etc_nginx/foo.conf → ...nternal/tests/testdata/etc_nginx/foo.conf
diff --git a/...a/etc_nginx/invalid_unicode_comments.conf → ...a/etc_nginx/invalid_unicode_comments.conf b/...a/etc_nginx/invalid_unicode_comments.conf → ...a/etc_nginx/invalid_unicode_comments.conf
diff --git a/...nginx/tests/testdata/etc_nginx/mime.types → ...ernal/tests/testdata/etc_nginx/mime.types b/...nginx/tests/testdata/etc_nginx/mime.types → ...ernal/tests/testdata/etc_nginx/mime.types
diff --git a/...data/etc_nginx/minimalistic_comments.conf → ...data/etc_nginx/minimalistic_comments.conf b/...data/etc_nginx/minimalistic_comments.conf → ...data/etc_nginx/minimalistic_comments.conf
diff --git a/.../testdata/etc_nginx/multiline_quotes.conf → .../testdata/etc_nginx/multiline_quotes.conf b/.../testdata/etc_nginx/multiline_quotes.conf → .../testdata/etc_nginx/multiline_quotes.conf
diff --git a/...nginx/tests/testdata/etc_nginx/nginx.conf → ...ernal/tests/testdata/etc_nginx/nginx.conf b/...nginx/tests/testdata/etc_nginx/nginx.conf → ...ernal/tests/testdata/etc_nginx/nginx.conf
diff --git a/...ginx/tests/testdata/etc_nginx/server.conf → ...rnal/tests/testdata/etc_nginx/server.conf b/...ginx/tests/testdata/etc_nginx/server.conf → ...rnal/tests/testdata/etc_nginx/server.conf
diff --git a/...testdata/etc_nginx/sites-enabled/both.com → ...testdata/etc_nginx/sites-enabled/both.com b/...testdata/etc_nginx/sites-enabled/both.com → ...testdata/etc_nginx/sites-enabled/both.com
diff --git a/.../testdata/etc_nginx/sites-enabled/default → .../testdata/etc_nginx/sites-enabled/default b/.../testdata/etc_nginx/sites-enabled/default → .../testdata/etc_nginx/sites-enabled/default
diff --git a/...tdata/etc_nginx/sites-enabled/example.com → ...tdata/etc_nginx/sites-enabled/example.com b/...tdata/etc_nginx/sites-enabled/example.com → ...tdata/etc_nginx/sites-enabled/example.com
diff --git a/...tdata/etc_nginx/sites-enabled/example.net → ...tdata/etc_nginx/sites-enabled/example.net b/...tdata/etc_nginx/sites-enabled/example.net → ...tdata/etc_nginx/sites-enabled/example.net
diff --git a/...ata/etc_nginx/sites-enabled/globalssl.com → ...ata/etc_nginx/sites-enabled/globalssl.com b/...ata/etc_nginx/sites-enabled/globalssl.com → ...ata/etc_nginx/sites-enabled/globalssl.com
diff --git a/...tdata/etc_nginx/sites-enabled/headers.com → ...tdata/etc_nginx/sites-enabled/headers.com b/...tdata/etc_nginx/sites-enabled/headers.com → ...tdata/etc_nginx/sites-enabled/headers.com
diff --git a/...testdata/etc_nginx/sites-enabled/ipv6.com → ...testdata/etc_nginx/sites-enabled/ipv6.com b/...testdata/etc_nginx/sites-enabled/ipv6.com → ...testdata/etc_nginx/sites-enabled/ipv6.com
diff --git a/...tdata/etc_nginx/sites-enabled/ipv6ssl.com → ...tdata/etc_nginx/sites-enabled/ipv6ssl.com b/...tdata/etc_nginx/sites-enabled/ipv6ssl.com → ...tdata/etc_nginx/sites-enabled/ipv6ssl.com
diff --git a/...ata/etc_nginx/sites-enabled/migration.com → ...ata/etc_nginx/sites-enabled/migration.com b/...ata/etc_nginx/sites-enabled/migration.com → ...ata/etc_nginx/sites-enabled/migration.com
diff --git a/...estdata/etc_nginx/sites-enabled/sslon.com → ...estdata/etc_nginx/sites-enabled/sslon.com b/...estdata/etc_nginx/sites-enabled/sslon.com → ...estdata/etc_nginx/sites-enabled/sslon.com
diff --git a/..._1_4_6/default_vhost/nginx/fastcgi_params → ..._1_4_6/default_vhost/nginx/fastcgi_params b/..._1_4_6/default_vhost/nginx/fastcgi_params → ..._1_4_6/default_vhost/nginx/fastcgi_params
diff --git a/...u_nginx_1_4_6/default_vhost/nginx/koi-utf → ...u_nginx_1_4_6/default_vhost/nginx/koi-utf b/...u_nginx_1_4_6/default_vhost/nginx/koi-utf → ...u_nginx_1_4_6/default_vhost/nginx/koi-utf
diff --git a/...u_nginx_1_4_6/default_vhost/nginx/koi-win → ...u_nginx_1_4_6/default_vhost/nginx/koi-win b/...u_nginx_1_4_6/default_vhost/nginx/koi-win → ...u_nginx_1_4_6/default_vhost/nginx/koi-win
diff --git a/...ginx_1_4_6/default_vhost/nginx/mime.types → ...ginx_1_4_6/default_vhost/nginx/mime.types b/...ginx_1_4_6/default_vhost/nginx/mime.types → ...ginx_1_4_6/default_vhost/nginx/mime.types
diff --git a/...6/default_vhost/nginx/naxsi-ui.conf.1.4.1 → ...6/default_vhost/nginx/naxsi-ui.conf.1.4.1 b/...6/default_vhost/nginx/naxsi-ui.conf.1.4.1 → ...6/default_vhost/nginx/naxsi-ui.conf.1.4.1
diff --git a/...inx_1_4_6/default_vhost/nginx/naxsi.rules → ...inx_1_4_6/default_vhost/nginx/naxsi.rules b/...inx_1_4_6/default_vhost/nginx/naxsi.rules → ...inx_1_4_6/default_vhost/nginx/naxsi.rules
diff --git a/..._4_6/default_vhost/nginx/naxsi_core.rules → ..._4_6/default_vhost/nginx/naxsi_core.rules b/..._4_6/default_vhost/nginx/naxsi_core.rules → ..._4_6/default_vhost/nginx/naxsi_core.rules
diff --git a/...ginx_1_4_6/default_vhost/nginx/nginx.conf → ...ginx_1_4_6/default_vhost/nginx/nginx.conf b/...ginx_1_4_6/default_vhost/nginx/nginx.conf → ...ginx_1_4_6/default_vhost/nginx/nginx.conf
diff --git a/...nx_1_4_6/default_vhost/nginx/proxy_params → ...nx_1_4_6/default_vhost/nginx/proxy_params b/...nx_1_4_6/default_vhost/nginx/proxy_params → ...nx_1_4_6/default_vhost/nginx/proxy_params
diff --git a/...inx_1_4_6/default_vhost/nginx/scgi_params → ...inx_1_4_6/default_vhost/nginx/scgi_params b/...inx_1_4_6/default_vhost/nginx/scgi_params → ...inx_1_4_6/default_vhost/nginx/scgi_params
diff --git a/...fault_vhost/nginx/sites-available/default → ...fault_vhost/nginx/sites-available/default b/...fault_vhost/nginx/sites-available/default → ...fault_vhost/nginx/sites-available/default
diff --git a/...default_vhost/nginx/sites-enabled/default → ...default_vhost/nginx/sites-enabled/default b/...default_vhost/nginx/sites-enabled/default → ...default_vhost/nginx/sites-enabled/default
diff --git a/...nx_1_4_6/default_vhost/nginx/uwsgi_params → ...nx_1_4_6/default_vhost/nginx/uwsgi_params b/...nx_1_4_6/default_vhost/nginx/uwsgi_params → ...nx_1_4_6/default_vhost/nginx/uwsgi_params
diff --git a/...u_nginx_1_4_6/default_vhost/nginx/win-utf → ...u_nginx_1_4_6/default_vhost/nginx/win-utf b/...u_nginx_1_4_6/default_vhost/nginx/win-utf → ...u_nginx_1_4_6/default_vhost/nginx/win-utf
diff --git a/...ata/etc_nginx/valid_unicode_comments.conf → ...ata/etc_nginx/valid_unicode_comments.conf b/...ata/etc_nginx/valid_unicode_comments.conf → ...ata/etc_nginx/valid_unicode_comments.conf