From 3130d60bd13b30e3708b4b342c78cd995c4cf4a6 Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Tue, 13 Jan 2026 12:30:58 -0800 Subject: [PATCH] move apache/nginx tests to our main tests dir --- .../{plugins/apache/tests => tests/plugins/apache}/__init__.py | 0 .../tests => tests/plugins/apache}/apache-conf-files/NEEDED.txt | 0 .../plugins/apache}/apache-conf-files/apache-conf-test | 0 .../plugins/apache}/apache-conf-files/apache-conf-test-pebble.py | 0 .../apache-conf-files/failing/missing-double-quote-1724.conf | 0 .../apache}/apache-conf-files/failing/multivhost-1093.conf | 0 .../apache}/apache-conf-files/failing/multivhost-1093b.conf | 0 .../plugins/apache}/apache-conf-files/passing/1626-1531.conf | 0 .../plugins/apache}/apache-conf-files/passing/README.modules | 0 .../plugins/apache}/apache-conf-files/passing/anarcat-1531.conf | 0 .../apache-conf-files/passing/comment-continuations-2050.conf | 0 .../apache-conf-files/passing/drupal-errordocument-arg-1724.conf | 0 .../apache}/apache-conf-files/passing/drupal-htaccess-1531.conf | 0 .../apache-conf-files/passing/escaped-space-arguments-2735.conf | 0 .../plugins/apache}/apache-conf-files/passing/example-1755.conf | 0 .../plugins/apache}/apache-conf-files/passing/example-ssl.conf | 0 .../plugins/apache}/apache-conf-files/passing/example.conf | 0 .../apache-conf-files/passing/finalize-1243.apache2.conf.txt | 0 .../plugins/apache}/apache-conf-files/passing/finalize-1243.conf | 0 .../apache}/apache-conf-files/passing/graphite-quote-1934.conf | 0 .../plugins/apache}/apache-conf-files/passing/ipv6-1143.conf | 0 .../plugins/apache}/apache-conf-files/passing/ipv6-1143b.conf | 0 .../plugins/apache}/apache-conf-files/passing/ipv6-1143c.conf | 0 .../plugins/apache}/apache-conf-files/passing/ipv6-1143d.conf | 0 .../apache}/apache-conf-files/passing/missing-quote-1724.conf | 0 .../plugins/apache}/apache-conf-files/passing/modmacro-1385.conf | 0 .../plugins/apache}/apache-conf-files/passing/owncloud-1264.conf | 0 .../apache}/apache-conf-files/passing/rewrite-quote-1960.conf | 0 .../plugins/apache}/apache-conf-files/passing/roundcube-1222.conf | 0 .../apache-conf-files/passing/section-continuations-2525.conf | 0 .../passing/section-empty-continuations-2731.conf | 0 .../plugins/apache}/apache-conf-files/passing/semacode-1598.conf | 0 .../apache-conf-files/passing/sslrequire-wordlist-1827.htaccess | 0 .../apache-conf-files/passing/two-blocks-one-line-1693.conf | 0 .../apache/tests => tests/plugins/apache}/augeasnode_test.py | 0 .../apache/tests => tests/plugins/apache}/autohsts_test.py | 0 .../{plugins/apache/tests => tests/plugins/apache}/centos_test.py | 0 .../apache/tests => tests/plugins/apache}/complex_parsing_test.py | 0 .../tests => tests/plugins/apache}/configurator_reverter_test.py | 0 .../apache/tests => tests/plugins/apache}/configurator_test.py | 0 .../{plugins/apache/tests => tests/plugins/apache}/conftest.py | 0 .../{plugins/apache/tests => tests/plugins/apache}/debian_test.py | 0 .../apache/tests => tests/plugins/apache}/display_ops_test.py | 0 .../apache/tests => tests/plugins/apache}/dualnode_test.py | 0 .../apache/tests => tests/plugins/apache}/entrypoint_test.py | 0 .../{plugins/apache/tests => tests/plugins/apache}/fedora_test.py | 0 .../{plugins/apache/tests => tests/plugins/apache}/gentoo_test.py | 0 .../apache/tests => tests/plugins/apache}/http_01_test.py | 0 .../{plugins/apache/tests => tests/plugins/apache}/obj_test.py | 0 .../{plugins/apache/tests => tests/plugins/apache}/parser_test.py | 0 .../plugins/apache}/parsernode_configurator_test.py | 0 .../apache/tests => tests/plugins/apache}/parsernode_test.py | 0 .../apache/tests => tests/plugins/apache}/parsernode_util_test.py | 0 .../apache}/testdata/centos7_apache/apache/httpd/conf.d/README | 0 .../testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf | 0 .../centos7_apache/apache/httpd/conf.d/centos.example.com.conf | 0 .../apache}/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf | 0 .../testdata/centos7_apache/apache/httpd/conf.d/userdir.conf | 0 .../testdata/centos7_apache/apache/httpd/conf.d/welcome.conf | 0 .../centos7_apache/apache/httpd/conf.modules.d/00-base.conf | 0 .../centos7_apache/apache/httpd/conf.modules.d/00-dav.conf | 0 .../centos7_apache/apache/httpd/conf.modules.d/00-lua.conf | 0 .../centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf | 0 .../centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf | 0 .../centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf | 0 .../centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf | 0 .../centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf | 0 .../apache}/testdata/centos7_apache/apache/httpd/conf/httpd.conf | 0 .../apache}/testdata/centos7_apache/apache/httpd/conf/magic | 0 .../plugins/apache}/testdata/centos7_apache/apache/sites | 0 .../apache}/testdata/centos7_apache/apache/sysconfig/httpd | 0 .../plugins/apache}/testdata/complex_parsing/apache2.conf | 0 .../apache}/testdata/complex_parsing/conf-enabled/dummy.conf | 0 .../plugins/apache}/testdata/complex_parsing/test_fnmatch.conf | 0 .../plugins/apache}/testdata/complex_parsing/test_variables.conf | 0 .../testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf | 0 .../augeas_vhosts/apache2/conf-available/bad_conf_file.conf | 0 .../apache2/conf-available/other-vhosts-access-log.conf | 0 .../augeas_vhosts/apache2/conf-available/security.conf | 0 .../augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf | 0 .../apache2/conf-enabled/other-vhosts-access-log.conf | 0 .../augeas_vhosts/apache2/conf-enabled/security.conf | 0 .../augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf | 0 .../testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars | 0 .../augeas_vhosts/apache2/mods-available/authz_svn.load | 0 .../augeas_vhosts/apache2/mods-available/dav.load | 0 .../augeas_vhosts/apache2/mods-available/dav_svn.conf | 0 .../augeas_vhosts/apache2/mods-available/dav_svn.load | 0 .../augeas_vhosts/apache2/mods-available/rewrite.load | 0 .../augeas_vhosts/apache2/mods-available/ssl.conf | 0 .../augeas_vhosts/apache2/mods-available/ssl.load | 0 .../augeas_vhosts/apache2/mods-enabled/authz_svn.load | 0 .../debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load | 0 .../augeas_vhosts/apache2/mods-enabled/dav_svn.conf | 0 .../augeas_vhosts/apache2/mods-enabled/dav_svn.load | 0 .../testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf | 0 .../augeas_vhosts/apache2/sites-available/another_wildcard.conf | 0 .../augeas_vhosts/apache2/sites-available/old-and-default.conf | 0 .../augeas_vhosts/apache2/sites-available/wildcard.conf | 0 .../augeas_vhosts/apache2/sites-enabled/another_wildcard.conf | 0 .../augeas_vhosts/apache2/sites-enabled/old-and-default.conf | 0 .../augeas_vhosts/apache2/sites-enabled/wildcard.conf | 0 .../apache}/testdata/debian_apache_2_4/augeas_vhosts/sites | 0 .../testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf | 0 .../apache2/conf-available/other-vhosts-access-log.conf | 0 .../default_vhost/apache2/conf-available/security.conf | 0 .../default_vhost/apache2/conf-available/serve-cgi-bin.conf | 0 .../apache2/conf-enabled/other-vhosts-access-log.conf | 0 .../default_vhost/apache2/conf-enabled/security.conf | 0 .../default_vhost/apache2/conf-enabled/serve-cgi-bin.conf | 0 .../testdata/debian_apache_2_4/default_vhost/apache2/envvars | 0 .../default_vhost/apache2/mods-available/ssl.conf | 0 .../default_vhost/apache2/mods-available/ssl.load | 0 .../testdata/debian_apache_2_4/default_vhost/apache2/ports.conf | 0 .../default_vhost/apache2/sites-available/000-default.conf | 0 .../default_vhost/apache2/sites-available/default-ssl.conf | 0 .../default_vhost/apache2/sites-enabled/000-default.conf | 0 .../apache}/testdata/debian_apache_2_4/default_vhost/sites | 0 .../testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf | 0 .../testdata/debian_apache_2_4/multi_vhosts/apache2/envvars | 0 .../testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf | 0 .../multi_vhosts/apache2/sites-available/default.conf | 0 .../multi_vhosts/apache2/sites-available/multi-vhost.conf | 0 .../multi_vhosts/apache2/sites-enabled/default.conf | 0 .../multi_vhosts/apache2/sites-enabled/multi-vhost.conf | 0 .../debian_apache_2_4/multiple_vhosts/apache2/apache2.conf | 0 .../multiple_vhosts/apache2/conf-available/bad_conf_file.conf | 0 .../apache2/conf-available/other-vhosts-access-log.conf | 0 .../multiple_vhosts/apache2/conf-available/security.conf | 0 .../multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf | 0 .../apache2/conf-enabled/other-vhosts-access-log.conf | 0 .../multiple_vhosts/apache2/conf-enabled/security.conf | 0 .../multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf | 0 .../testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars | 0 .../multiple_vhosts/apache2/mods-available/authz_svn.load | 0 .../multiple_vhosts/apache2/mods-available/dav.load | 0 .../multiple_vhosts/apache2/mods-available/dav_svn.conf | 0 .../multiple_vhosts/apache2/mods-available/dav_svn.load | 0 .../multiple_vhosts/apache2/mods-available/rewrite.load | 0 .../multiple_vhosts/apache2/mods-available/ssl.conf | 0 .../multiple_vhosts/apache2/mods-available/ssl.load | 0 .../multiple_vhosts/apache2/mods-enabled/authz_svn.load | 0 .../multiple_vhosts/apache2/mods-enabled/dav.load | 0 .../multiple_vhosts/apache2/mods-enabled/dav_svn.conf | 0 .../multiple_vhosts/apache2/mods-enabled/dav_svn.load | 0 .../testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf | 0 .../multiple_vhosts/apache2/sites-available/000-default.conf | 0 .../multiple_vhosts/apache2/sites-available/certbot.conf | 0 .../apache2/sites-available/default-ssl-port-only.conf | 0 .../multiple_vhosts/apache2/sites-available/default-ssl.conf | 0 .../multiple_vhosts/apache2/sites-available/duplicatehttp.conf | 0 .../multiple_vhosts/apache2/sites-available/duplicatehttps.conf | 0 .../multiple_vhosts/apache2/sites-available/empty.conf | 0 .../apache2/sites-available/encryption-example.conf | 0 .../apache2/sites-available/mod_macro-example.conf | 0 .../multiple_vhosts/apache2/sites-available/no-directives.conf | 0 .../multiple_vhosts/apache2/sites-available/ocsp-ssl.conf | 0 .../multiple_vhosts/apache2/sites-available/wildcard.conf | 0 .../multiple_vhosts/apache2/sites-enabled/000-default.conf | 0 .../multiple_vhosts/apache2/sites-enabled/certbot.conf | 0 .../apache2/sites-enabled/default-ssl-port-only.conf | 0 .../multiple_vhosts/apache2/sites-enabled/default-ssl.conf | 0 .../multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf | 0 .../multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf | 0 .../multiple_vhosts/apache2/sites-enabled/encryption-example.conf | 0 .../multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf | 0 .../multiple_vhosts/apache2/sites-enabled/non-symlink.conf | 0 .../multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf | 0 .../multiple_vhosts/apache2/sites-enabled/wildcard.conf | 0 .../apache}/testdata/debian_apache_2_4/multiple_vhosts/sites | 0 .../apache}/testdata/gentoo_apache/apache/apache2/httpd.conf | 0 .../plugins/apache}/testdata/gentoo_apache/apache/apache2/magic | 0 .../apache/apache2/modules.d/00_default_settings.conf | 0 .../apache/apache2/modules.d/00_error_documents.conf | 0 .../gentoo_apache/apache/apache2/modules.d/00_languages.conf | 0 .../gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf | 0 .../gentoo_apache/apache/apache2/modules.d/00_mod_info.conf | 0 .../gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf | 0 .../gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf | 0 .../gentoo_apache/apache/apache2/modules.d/00_mod_status.conf | 0 .../gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf | 0 .../testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf | 0 .../gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf | 0 .../gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf | 0 .../gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf | 0 .../gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf | 0 .../gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf | 0 .../apache/apache2/vhosts.d/00_default_ssl_vhost.conf | 0 .../gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf | 0 .../gentoo_apache/apache/apache2/vhosts.d/default_vhost.include | 0 .../gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf | 0 .../plugins/apache}/testdata/gentoo_apache/apache/conf.d/apache2 | 0 .../plugins/apache}/testdata/gentoo_apache/apache/sites | 0 .../{plugins/apache/tests => tests/plugins/apache}/util.py | 0 .../{plugins/nginx/tests => tests/plugins/nginx}/__init__.py | 0 .../nginx/tests => tests/plugins/nginx}/configurator_test.py | 0 .../nginx/tests => tests/plugins/nginx}/display_ops_test.py | 0 .../{plugins/nginx/tests => tests/plugins/nginx}/http_01_test.py | 0 .../nginx/tests => tests/plugins/nginx}/nginxparser_test.py | 0 .../{plugins/nginx/tests => tests/plugins/nginx}/obj_test.py | 0 .../nginx/tests => tests/plugins/nginx}/parser_obj_test.py | 0 .../{plugins/nginx/tests => tests/plugins/nginx}/parser_test.py | 0 .../{plugins/nginx/tests => tests/plugins/nginx}/test_util.py | 0 .../tests => tests/plugins/nginx}/testdata/etc_nginx/broken.conf | 0 .../plugins/nginx}/testdata/etc_nginx/comment_in_file.conf | 0 .../plugins/nginx}/testdata/etc_nginx/edge_cases.conf | 0 .../tests => tests/plugins/nginx}/testdata/etc_nginx/foo.conf | 0 .../nginx}/testdata/etc_nginx/invalid_unicode_comments.conf | 0 .../tests => tests/plugins/nginx}/testdata/etc_nginx/mime.types | 0 .../plugins/nginx}/testdata/etc_nginx/minimalistic_comments.conf | 0 .../plugins/nginx}/testdata/etc_nginx/multiline_quotes.conf | 0 .../plugins/nginx}/testdata/etc_nginx/nginx-include.conf | 0 .../tests => tests/plugins/nginx}/testdata/etc_nginx/nginx.conf | 0 .../tests => tests/plugins/nginx}/testdata/etc_nginx/server.conf | 0 .../plugins/nginx}/testdata/etc_nginx/sites-enabled/addr-80.com | 0 .../plugins/nginx}/testdata/etc_nginx/sites-enabled/both.com | 0 .../plugins/nginx}/testdata/etc_nginx/sites-enabled/default | 0 .../plugins/nginx}/testdata/etc_nginx/sites-enabled/example.com | 0 .../plugins/nginx}/testdata/etc_nginx/sites-enabled/example.net | 0 .../plugins/nginx}/testdata/etc_nginx/sites-enabled/globalssl.com | 0 .../plugins/nginx}/testdata/etc_nginx/sites-enabled/headers.com | 0 .../plugins/nginx}/testdata/etc_nginx/sites-enabled/ipv6.com | 0 .../plugins/nginx}/testdata/etc_nginx/sites-enabled/ipv6ssl.com | 0 .../plugins/nginx}/testdata/etc_nginx/sites-enabled/migration.com | 0 .../nginx}/testdata/etc_nginx/sites-enabled/no-listens.com | 0 .../plugins/nginx}/testdata/etc_nginx/sites-enabled/sslon.com | 0 .../ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params | 0 .../etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf | 0 .../etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win | 0 .../etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types | 0 .../ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1 | 0 .../etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules | 0 .../ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules | 0 .../etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf | 0 .../etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params | 0 .../etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params | 0 .../default_vhost/nginx/sites-available/default | 0 .../ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default | 0 .../etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params | 0 .../etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf | 0 .../plugins/nginx}/testdata/etc_nginx/valid_unicode_comments.conf | 0 241 files changed, 0 insertions(+), 0 deletions(-) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/__init__.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/NEEDED.txt (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/apache-conf-test (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/apache-conf-test-pebble.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/failing/missing-double-quote-1724.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/failing/multivhost-1093.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/failing/multivhost-1093b.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/1626-1531.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/README.modules (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/anarcat-1531.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/comment-continuations-2050.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/drupal-errordocument-arg-1724.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/drupal-htaccess-1531.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/escaped-space-arguments-2735.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/example-1755.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/example-ssl.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/example.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/finalize-1243.apache2.conf.txt (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/finalize-1243.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/graphite-quote-1934.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/ipv6-1143.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/ipv6-1143b.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/ipv6-1143c.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/ipv6-1143d.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/missing-quote-1724.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/modmacro-1385.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/owncloud-1264.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/rewrite-quote-1960.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/roundcube-1222.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/section-continuations-2525.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/section-empty-continuations-2731.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/semacode-1598.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/apache-conf-files/passing/two-blocks-one-line-1693.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/augeasnode_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/autohsts_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/centos_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/complex_parsing_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/configurator_reverter_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/configurator_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/conftest.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/debian_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/display_ops_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/dualnode_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/entrypoint_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/fedora_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/gentoo_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/http_01_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/obj_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/parser_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/parsernode_configurator_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/parsernode_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/parsernode_util_test.py (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.d/README (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf/httpd.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/httpd/conf/magic (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/sites (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/centos7_apache/apache/sysconfig/httpd (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/complex_parsing/apache2.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/complex_parsing/conf-enabled/dummy.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/complex_parsing/test_fnmatch.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/complex_parsing/test_variables.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/augeas_vhosts/sites (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/envvars (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/default_vhost/sites (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/debian_apache_2_4/multiple_vhosts/sites (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/httpd.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/magic (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/conf.d/apache2 (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/testdata/gentoo_apache/apache/sites (100%) rename certbot/src/certbot/_internal/{plugins/apache/tests => tests/plugins/apache}/util.py (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/__init__.py (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/configurator_test.py (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/display_ops_test.py (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/http_01_test.py (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/nginxparser_test.py (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/obj_test.py (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/parser_obj_test.py (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/parser_test.py (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/test_util.py (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/broken.conf (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/comment_in_file.conf (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/edge_cases.conf (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/foo.conf (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/invalid_unicode_comments.conf (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/mime.types (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/minimalistic_comments.conf (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/multiline_quotes.conf (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/nginx-include.conf (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/nginx.conf (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/server.conf (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/sites-enabled/addr-80.com (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/sites-enabled/both.com (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/sites-enabled/default (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/sites-enabled/example.com (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/sites-enabled/example.net (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/sites-enabled/globalssl.com (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/sites-enabled/headers.com (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/sites-enabled/ipv6.com (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/sites-enabled/ipv6ssl.com (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/sites-enabled/migration.com (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/sites-enabled/no-listens.com (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/sites-enabled/sslon.com (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1 (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf (100%) rename certbot/src/certbot/_internal/{plugins/nginx/tests => tests/plugins/nginx}/testdata/etc_nginx/valid_unicode_comments.conf (100%) diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/__init__.py b/certbot/src/certbot/_internal/tests/plugins/apache/__init__.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/__init__.py rename to certbot/src/certbot/_internal/tests/plugins/apache/__init__.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/NEEDED.txt b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/NEEDED.txt similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/NEEDED.txt rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/NEEDED.txt diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/apache-conf-test b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/apache-conf-test similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/apache-conf-test rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/apache-conf-test diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/apache-conf-test-pebble.py b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/apache-conf-test-pebble.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/apache-conf-test-pebble.py rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/apache-conf-test-pebble.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/failing/missing-double-quote-1724.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/failing/missing-double-quote-1724.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/failing/missing-double-quote-1724.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/failing/missing-double-quote-1724.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/failing/multivhost-1093.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/failing/multivhost-1093.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/failing/multivhost-1093.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/failing/multivhost-1093.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/failing/multivhost-1093b.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/failing/multivhost-1093b.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/failing/multivhost-1093b.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/failing/multivhost-1093b.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/1626-1531.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/1626-1531.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/1626-1531.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/1626-1531.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/README.modules b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/README.modules similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/README.modules rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/README.modules diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/anarcat-1531.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/anarcat-1531.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/anarcat-1531.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/anarcat-1531.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/comment-continuations-2050.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/comment-continuations-2050.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/comment-continuations-2050.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/comment-continuations-2050.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/drupal-errordocument-arg-1724.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/drupal-errordocument-arg-1724.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/drupal-htaccess-1531.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/drupal-htaccess-1531.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/drupal-htaccess-1531.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/drupal-htaccess-1531.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/escaped-space-arguments-2735.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/escaped-space-arguments-2735.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/escaped-space-arguments-2735.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/escaped-space-arguments-2735.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/example-1755.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/example-1755.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/example-1755.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/example-1755.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/example-ssl.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/example-ssl.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/example-ssl.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/example-ssl.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/example.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/example.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/example.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/example.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/finalize-1243.apache2.conf.txt similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/finalize-1243.apache2.conf.txt diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/finalize-1243.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/finalize-1243.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/finalize-1243.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/finalize-1243.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/graphite-quote-1934.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/graphite-quote-1934.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/graphite-quote-1934.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/graphite-quote-1934.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/ipv6-1143.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/ipv6-1143.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/ipv6-1143.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/ipv6-1143.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/ipv6-1143b.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/ipv6-1143b.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/ipv6-1143b.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/ipv6-1143b.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/ipv6-1143c.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/ipv6-1143c.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/ipv6-1143c.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/ipv6-1143c.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/ipv6-1143d.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/ipv6-1143d.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/ipv6-1143d.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/ipv6-1143d.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/missing-quote-1724.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/missing-quote-1724.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/missing-quote-1724.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/missing-quote-1724.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/modmacro-1385.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/modmacro-1385.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/modmacro-1385.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/modmacro-1385.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/owncloud-1264.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/owncloud-1264.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/owncloud-1264.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/owncloud-1264.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/rewrite-quote-1960.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/rewrite-quote-1960.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/rewrite-quote-1960.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/rewrite-quote-1960.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/roundcube-1222.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/roundcube-1222.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/roundcube-1222.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/roundcube-1222.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/section-continuations-2525.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/section-continuations-2525.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/section-continuations-2525.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/section-continuations-2525.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/section-empty-continuations-2731.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/section-empty-continuations-2731.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/section-empty-continuations-2731.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/section-empty-continuations-2731.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/semacode-1598.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/semacode-1598.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/semacode-1598.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/semacode-1598.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf b/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/two-blocks-one-line-1693.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/passing/two-blocks-one-line-1693.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/augeasnode_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/augeasnode_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/augeasnode_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/augeasnode_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/autohsts_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/autohsts_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/autohsts_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/autohsts_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/centos_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/centos_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/centos_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/centos_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/complex_parsing_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/complex_parsing_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/complex_parsing_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/complex_parsing_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/configurator_reverter_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/configurator_reverter_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/configurator_reverter_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/configurator_reverter_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/configurator_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/configurator_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/configurator_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/configurator_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/conftest.py b/certbot/src/certbot/_internal/tests/plugins/apache/conftest.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/conftest.py rename to certbot/src/certbot/_internal/tests/plugins/apache/conftest.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/debian_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/debian_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/debian_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/debian_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/display_ops_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/display_ops_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/display_ops_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/display_ops_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/dualnode_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/dualnode_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/dualnode_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/dualnode_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/entrypoint_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/entrypoint_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/entrypoint_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/entrypoint_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/fedora_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/fedora_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/fedora_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/fedora_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/gentoo_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/gentoo_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/gentoo_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/gentoo_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/http_01_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/http_01_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/http_01_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/http_01_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/obj_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/obj_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/obj_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/obj_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/parser_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/parser_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/parser_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/parser_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/parsernode_configurator_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/parsernode_configurator_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/parsernode_configurator_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/parsernode_configurator_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/parsernode_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/parsernode_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/parsernode_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/parsernode_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/parsernode_util_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/parsernode_util_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/parsernode_util_test.py rename to certbot/src/certbot/_internal/tests/plugins/apache/parsernode_util_test.py diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/README b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.d/README similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/README rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.d/README diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf/httpd.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf/httpd.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf/httpd.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf/httpd.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf/magic b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf/magic similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/httpd/conf/magic rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/httpd/conf/magic diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/sites b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/sites similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/sites rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/sites diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/sysconfig/httpd b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/sysconfig/httpd similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/centos7_apache/apache/sysconfig/httpd rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/centos7_apache/apache/sysconfig/httpd diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/complex_parsing/apache2.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/complex_parsing/apache2.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/complex_parsing/apache2.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/complex_parsing/apache2.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/complex_parsing/conf-enabled/dummy.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/complex_parsing/conf-enabled/dummy.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/complex_parsing/conf-enabled/dummy.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/complex_parsing/conf-enabled/dummy.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/complex_parsing/test_fnmatch.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/complex_parsing/test_fnmatch.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/complex_parsing/test_fnmatch.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/complex_parsing/test_fnmatch.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/complex_parsing/test_variables.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/complex_parsing/test_variables.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/complex_parsing/test_variables.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/complex_parsing/test_variables.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/sites b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/sites similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/sites rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/augeas_vhosts/sites diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/envvars similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/envvars diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/sites b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/sites similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/default_vhost/sites rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/default_vhost/sites diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/sites b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/sites similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/sites rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/debian_apache_2_4/multiple_vhosts/sites diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/httpd.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/httpd.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/httpd.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/httpd.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/magic b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/magic similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/magic rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/magic diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/conf.d/apache2 b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/conf.d/apache2 similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/conf.d/apache2 rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/conf.d/apache2 diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/sites b/certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/sites similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/testdata/gentoo_apache/apache/sites rename to certbot/src/certbot/_internal/tests/plugins/apache/testdata/gentoo_apache/apache/sites diff --git a/certbot/src/certbot/_internal/plugins/apache/tests/util.py b/certbot/src/certbot/_internal/tests/plugins/apache/util.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/apache/tests/util.py rename to certbot/src/certbot/_internal/tests/plugins/apache/util.py diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/__init__.py b/certbot/src/certbot/_internal/tests/plugins/nginx/__init__.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/__init__.py rename to certbot/src/certbot/_internal/tests/plugins/nginx/__init__.py diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/configurator_test.py b/certbot/src/certbot/_internal/tests/plugins/nginx/configurator_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/configurator_test.py rename to certbot/src/certbot/_internal/tests/plugins/nginx/configurator_test.py diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/display_ops_test.py b/certbot/src/certbot/_internal/tests/plugins/nginx/display_ops_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/display_ops_test.py rename to certbot/src/certbot/_internal/tests/plugins/nginx/display_ops_test.py diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/http_01_test.py b/certbot/src/certbot/_internal/tests/plugins/nginx/http_01_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/http_01_test.py rename to certbot/src/certbot/_internal/tests/plugins/nginx/http_01_test.py diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/nginxparser_test.py b/certbot/src/certbot/_internal/tests/plugins/nginx/nginxparser_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/nginxparser_test.py rename to certbot/src/certbot/_internal/tests/plugins/nginx/nginxparser_test.py diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/obj_test.py b/certbot/src/certbot/_internal/tests/plugins/nginx/obj_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/obj_test.py rename to certbot/src/certbot/_internal/tests/plugins/nginx/obj_test.py diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/parser_obj_test.py b/certbot/src/certbot/_internal/tests/plugins/nginx/parser_obj_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/parser_obj_test.py rename to certbot/src/certbot/_internal/tests/plugins/nginx/parser_obj_test.py diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/parser_test.py b/certbot/src/certbot/_internal/tests/plugins/nginx/parser_test.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/parser_test.py rename to certbot/src/certbot/_internal/tests/plugins/nginx/parser_test.py diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/test_util.py b/certbot/src/certbot/_internal/tests/plugins/nginx/test_util.py similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/test_util.py rename to certbot/src/certbot/_internal/tests/plugins/nginx/test_util.py diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/broken.conf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/broken.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/broken.conf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/broken.conf diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/comment_in_file.conf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/comment_in_file.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/comment_in_file.conf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/comment_in_file.conf diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/edge_cases.conf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/edge_cases.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/edge_cases.conf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/edge_cases.conf diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/foo.conf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/foo.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/foo.conf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/foo.conf diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/invalid_unicode_comments.conf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/invalid_unicode_comments.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/invalid_unicode_comments.conf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/invalid_unicode_comments.conf diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/mime.types b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/mime.types similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/mime.types rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/mime.types diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/minimalistic_comments.conf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/minimalistic_comments.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/minimalistic_comments.conf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/minimalistic_comments.conf diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/multiline_quotes.conf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/multiline_quotes.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/multiline_quotes.conf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/multiline_quotes.conf diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/nginx-include.conf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/nginx-include.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/nginx-include.conf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/nginx-include.conf diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/nginx.conf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/nginx.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/nginx.conf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/nginx.conf diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/server.conf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/server.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/server.conf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/server.conf diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/addr-80.com b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/addr-80.com similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/addr-80.com rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/addr-80.com diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/both.com b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/both.com similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/both.com rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/both.com diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/default b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/default similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/default rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/default diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/example.com b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/example.com similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/example.com rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/example.com diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/example.net b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/example.net similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/example.net rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/example.net diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/globalssl.com b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/globalssl.com similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/globalssl.com rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/globalssl.com diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/headers.com b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/headers.com similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/headers.com rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/headers.com diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/ipv6.com b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/ipv6.com similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/ipv6.com rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/ipv6.com diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/ipv6ssl.com b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/ipv6ssl.com similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/ipv6ssl.com rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/ipv6ssl.com diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/migration.com b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/migration.com similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/migration.com rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/migration.com diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/no-listens.com b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/no-listens.com similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/no-listens.com rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/no-listens.com diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/sslon.com b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/sslon.com similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/sslon.com rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/sites-enabled/sslon.com diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1 b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1 similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1 rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1 diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf diff --git a/certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/valid_unicode_comments.conf b/certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/valid_unicode_comments.conf similarity index 100% rename from certbot/src/certbot/_internal/plugins/nginx/tests/testdata/etc_nginx/valid_unicode_comments.conf rename to certbot/src/certbot/_internal/tests/plugins/nginx/testdata/etc_nginx/valid_unicode_comments.conf