From ba2958f412b830d08b115e12cf1c812ec5dd35df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Tue, 17 Mar 2026 17:08:15 +0100 Subject: [PATCH 1/2] Use underscore for system test names Change the convention for system test directory names to always use an underscore rather than a hyphen. Names using underscore are valid python package names and can be used with standard `import` facilities in python, which allows easier code reuse. The temporary directories for test execution and their convenience symlinks have been switched to using hyphens rather than underscores to keep the pytest collection, filtering and .gitignore working as expected. (cherry picked from commit 9f4c1d1993fe624c5d68cbc51521dd4761513cd2) --- bin/tests/system/.gitignore | 9 ++++----- bin/tests/system/Makefile.am | 14 +++++++------- bin/tests/system/conftest.py | 10 +++++----- dangerfile.py | 6 +++--- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/bin/tests/system/.gitignore b/bin/tests/system/.gitignore index f946793ae7..6c34bfcd1a 100644 --- a/bin/tests/system/.gitignore +++ b/bin/tests/system/.gitignore @@ -24,10 +24,9 @@ parallel.mk /stop.sh /ifconfig.sh -# Ignore file names with underscore in their name except python or shell files. +# Ignore file names with a hyphen in their name except C files. # This is done to ignore the temporary directories and symlinks created by the # pytest runner, which contain underscore in their file names. -/*_* -!/*_*.py -!/*_*.sh -!/_common +/*-* +!/*-*.c +!/custom-test-driver diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am index d4526d2dd8..57b019bdc5 100644 --- a/bin/tests/system/Makefile.am +++ b/bin/tests/system/Makefile.am @@ -88,13 +88,13 @@ tkey_keydelete_LDADD = \ TESTS = \ rpz \ rpzrecurse \ - serve-stale \ + serve_stale \ timeouts \ upforwd \ acl \ additional \ addzone \ - allow-query \ + allow_query \ auth \ autosign \ builtin \ @@ -117,7 +117,7 @@ TESTS = \ dlzexternal \ dns64 \ dnssec \ - dnssec-malformed-dnskey \ + dnssec_malformed_dnskey \ dnstap \ doth \ dsdigest \ @@ -128,14 +128,14 @@ TESTS = \ ednscompliance \ emptyzones \ enginepkcs11 \ - filter-aaaa \ + filter_aaaa \ fetchlimit \ formerr \ forward \ geoip2 \ glue \ idna \ - include-multiplecfg \ + include_multiplecfg \ inline \ integrity \ ixfr \ @@ -189,7 +189,7 @@ TESTS = \ tcp \ tkey \ tools \ - transport-acl \ + transport_acl \ tsig \ tsiggss \ ttl \ @@ -231,4 +231,4 @@ LOG_COMPILER = $(srcdir)/run.sh test-local: check clean-local:: - -find -L . -mindepth 1 -maxdepth 1 -type d -name "*_*" -and -not -name "_common" -exec rm -rf {} \; + -find -L . -mindepth 1 -maxdepth 1 -type d -name "*-*" -exec rm -rf {} \; diff --git a/bin/tests/system/conftest.py b/bin/tests/system/conftest.py index 8fc9dd8a11..2f84bb108b 100644 --- a/bin/tests/system/conftest.py +++ b/bin/tests/system/conftest.py @@ -53,7 +53,7 @@ PRIORITY_TESTS = [ PRIORITY_TESTS_RE = Re("|".join(PRIORITY_TESTS)) SYSTEM_TEST_DIR_GIT_PATH = "bin/tests/system" SYSTEM_TEST_NAME_RE = Re(f"{SYSTEM_TEST_DIR_GIT_PATH}" + r"/([^/]+)") -SYMLINK_REPLACEMENT_RE = Re(r"/tests(_.*)\.py") +SYMLINK_REPLACEMENT_RE = Re(r"/tests_(.*)\.py") # ---------------------- Module initialization --------------------------- @@ -132,14 +132,14 @@ def pytest_ignore_collect(collection_path): # ignore these during test collection phase. Otherwise, test artifacts # from previous runs could mess with the runner. Also ignore the # convenience symlinks to those test directories. In both of those - # cases, the system test name (directory) contains an underscore, which + # cases, the system test name (directory) contains a hyphen, which # is otherwise and invalid character for a system test name. match = SYSTEM_TEST_NAME_RE.search(str(collection_path)) if match is None: isctest.log.warning("unexpected test path: %s (ignored)", collection_path) return True system_test_name = match.groups()[0] - return "_" in system_test_name + return "-" in system_test_name def pytest_collection_modifyitems(items): @@ -449,13 +449,13 @@ def system_test_dir(request, env, system_test_name, expected_artifacts): f"{env['TOP_BUILDDIR']}/{SYSTEM_TEST_DIR_GIT_PATH}" ).resolve() testdir = Path( - tempfile.mkdtemp(prefix=f"{system_test_name}_tmp_", dir=system_test_root) + tempfile.mkdtemp(prefix=f"{system_test_name}-tmp-", dir=system_test_root) ) shutil.rmtree(testdir) shutil.copytree(system_test_root / system_test_name, testdir) # Create a convenience symlink with a stable and predictable name - module_name = SYMLINK_REPLACEMENT_RE.sub(r"\1", str(request.node.path)) + module_name = SYMLINK_REPLACEMENT_RE.sub(r"-\1", str(request.node.path)) symlink_dst = system_test_root / module_name symlink_dst.unlink(missing_ok=True) symlink_dst.symlink_to(os.path.relpath(testdir, start=system_test_root)) diff --git a/dangerfile.py b/dangerfile.py index b6851be7a5..c716934f09 100644 --- a/dangerfile.py +++ b/dangerfile.py @@ -494,10 +494,10 @@ for testname in testnames: or testname == "isctest" ): continue - if "_" in testname: + if "-" in testname: fail( - f"System test directory `{testname}` may not contain an underscore, " - "use hyphen instead." + f"System test directory `{testname}` may not contain a hyphen, " + "use underscore instead." ) if not glob.glob(f"{dirpath}/**/tests_*.py", recursive=True): fail( From 2441028e724955eb6b1f9aa37884c32ea69c3e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Wed, 18 Mar 2026 12:59:44 +0100 Subject: [PATCH 2/2] Rename all system test to use underscore All system tests previously using a hyphen have been renamed to use underscore instead. A couple of symlinks were corrected and one path in `nsec3-answer` adjusted accordingly. (cherry picked from commit 67aca1f8c6f19de11f238a402604697be4ff64dc) --- bin/tests/system/{allow-query => allow_query}/.gitignore | 0 bin/tests/system/{allow-query => allow_query}/ns1/named.conf.in | 0 bin/tests/system/{allow-query => allow_query}/ns1/root.db | 0 bin/tests/system/{allow-query => allow_query}/ns2/generic.db | 0 .../system/{allow-query => allow_query}/ns2/named01.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named02.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named03.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named04.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named05.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named06.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named07.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named08.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named09.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named10.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named11.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named12.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named21.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named22.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named23.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named24.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named25.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named26.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named27.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named28.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named29.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named30.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named31.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named32.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named33.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named34.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named40.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named53.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named54.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named55.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named56.conf.in | 0 .../system/{allow-query => allow_query}/ns2/named57.conf.in | 0 bin/tests/system/{allow-query => allow_query}/ns3/named.args | 0 .../system/{allow-query => allow_query}/ns3/named1.conf.in | 0 .../system/{allow-query => allow_query}/ns3/named2.conf.in | 0 .../system/{allow-query => allow_query}/ns3/named3.conf.in | 0 .../system/{allow-query => allow_query}/ns3/named4.conf.in | 0 bin/tests/system/{allow-query => allow_query}/setup.sh | 0 bin/tests/system/{allow-query => allow_query}/tests.sh | 0 .../system/{allow-query => allow_query}/tests_sh_allow_query.py | 0 .../ns2/example.db.in | 0 .../ns2/named.conf.j2 | 0 .../ns2/truncated.selfsigned.db.signed | 0 .../ns2/trusted.conf.j2 | 0 .../ns3/named.conf.j2 | 0 .../ns3/trusted.conf.j2 | 0 .../tests_malformed_dnskey.py | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/.gitignore | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/conf/bad1.conf | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/conf/bad2.conf | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/conf/bad3.conf | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/conf/bad4.conf | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/conf/bad5.conf | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/conf/good1.conf | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/conf/good2.conf | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/conf/good3.conf | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/conf/good4.conf | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/conf/good5.conf | 0 .../system/{filter-aaaa => filter_aaaa}/ns1/named1.conf.in | 0 .../system/{filter-aaaa => filter_aaaa}/ns1/named2.conf.in | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/ns1/root.db | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/ns1/sign.sh | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/ns1/signed.db.in | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/ns1/unsigned.db | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/ns2/hints | 0 .../system/{filter-aaaa => filter_aaaa}/ns2/named1.conf.in | 0 .../system/{filter-aaaa => filter_aaaa}/ns2/named2.conf.in | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/ns3/hints | 0 .../system/{filter-aaaa => filter_aaaa}/ns3/named1.conf.in | 0 .../system/{filter-aaaa => filter_aaaa}/ns3/named2.conf.in | 0 .../system/{filter-aaaa => filter_aaaa}/ns4/named1.conf.in | 0 .../system/{filter-aaaa => filter_aaaa}/ns4/named2.conf.in | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/ns4/root.db | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/ns4/sign.sh | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/ns4/signed.db.in | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/ns4/unsigned.db | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/ns5/hints | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/ns5/named.conf.in | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/setup.sh | 0 bin/tests/system/{filter-aaaa => filter_aaaa}/tests.sh | 0 .../system/{filter-aaaa => filter_aaaa}/tests_sh_filter_aaaa.py | 0 .../ns2/mars.com.db | 0 .../{include-multiplecfg => include_multiplecfg}/ns2/mars.conf | 0 .../ns2/named.conf.in | 0 .../ns2/zone1.com.db | 0 .../{include-multiplecfg => include_multiplecfg}/ns2/zone1.conf | 0 .../ns2/zone2.com.db | 0 .../{include-multiplecfg => include_multiplecfg}/ns2/zone2.conf | 0 .../{include-multiplecfg => include_multiplecfg}/setup.sh | 0 .../tests_include_multiplecfg.py | 0 .../{mirror-root-zone => mirror_root_zone}/ns1/named.conf.j2 | 0 .../tests_mirror_root_zone.py | 0 .../system/{nsec3-answer => nsec3_answer}/ns1/named.conf.j2 | 0 bin/tests/system/{nsec3-answer => nsec3_answer}/ns1/root.db.in | 0 bin/tests/system/{nsec3-answer => nsec3_answer}/ns1/sign.sh | 0 .../system/{nsec3-answer => nsec3_answer}/ns2/named.conf.j2 | 0 bin/tests/system/{nsec3-answer => nsec3_answer}/setup.sh | 0 bin/tests/system/{nsec3-answer => nsec3_answer}/tests_nsec3.py | 2 +- bin/tests/system/{serve-stale => serve_stale}/.gitignore | 0 bin/tests/system/{serve-stale => serve_stale}/ans2/ans.pl | 0 bin/tests/system/{serve-stale => serve_stale}/ans8/ans.pl | 0 .../system/{serve-stale => serve_stale}/ns1/named1.conf.in | 0 .../system/{serve-stale => serve_stale}/ns1/named2.conf.in | 0 .../system/{serve-stale => serve_stale}/ns1/named3.conf.in | 0 .../system/{serve-stale => serve_stale}/ns1/named4.conf.in | 0 bin/tests/system/{serve-stale => serve_stale}/ns1/root.db | 0 bin/tests/system/{serve-stale => serve_stale}/ns1/stale.test.db | 0 bin/tests/system/{serve-stale => serve_stale}/ns3/named.conf.in | 0 .../system/{serve-stale => serve_stale}/ns3/named1.conf.in | 0 .../system/{serve-stale => serve_stale}/ns3/named10.conf.in | 0 .../system/{serve-stale => serve_stale}/ns3/named2.conf.in | 0 .../system/{serve-stale => serve_stale}/ns3/named3.conf.in | 0 .../system/{serve-stale => serve_stale}/ns3/named4.conf.in | 0 .../system/{serve-stale => serve_stale}/ns3/named5.conf.in | 0 .../system/{serve-stale => serve_stale}/ns3/named6.conf.in | 0 .../system/{serve-stale => serve_stale}/ns3/named7.conf.in | 0 .../system/{serve-stale => serve_stale}/ns3/named8.conf.in | 0 .../system/{serve-stale => serve_stale}/ns3/named9.conf.in | 0 bin/tests/system/{serve-stale => serve_stale}/ns3/root.db | 0 .../system/{serve-stale => serve_stale}/ns3/serve.stale.db | 0 bin/tests/system/{serve-stale => serve_stale}/ns4/named.conf.in | 0 bin/tests/system/{serve-stale => serve_stale}/ns5/named.conf.in | 0 bin/tests/system/{serve-stale => serve_stale}/ns6/named.conf.in | 0 .../system/{serve-stale => serve_stale}/ns6/serve.stale.db | 0 bin/tests/system/{serve-stale => serve_stale}/ns6/stale.db | 0 bin/tests/system/{serve-stale => serve_stale}/ns7/named.conf.j2 | 0 .../system/{serve-stale => serve_stale}/ns7/named1.conf.j2 | 0 bin/tests/system/{serve-stale => serve_stale}/ns7/root.db | 0 .../system/{serve-stale => serve_stale}/ns7/target.stale.db | 0 bin/tests/system/{serve-stale => serve_stale}/prereq.sh | 0 bin/tests/system/{serve-stale => serve_stale}/setup.sh | 0 bin/tests/system/{serve-stale => serve_stale}/tests.sh | 0 .../system/{serve-stale => serve_stale}/tests_sh_serve_stale.py | 0 .../system/{transport-acl => transport_acl}/ns1/named.conf.in | 0 .../{transport-acl => transport_acl}/self-signed-cert.pem | 0 .../system/{transport-acl => transport_acl}/self-signed-key.pem | 0 bin/tests/system/{transport-acl => transport_acl}/setup.sh | 0 bin/tests/system/{transport-acl => transport_acl}/tests.sh | 0 .../{transport-acl => transport_acl}/tests_sh_transport_acl.py | 0 .../ns1/named-http-plain.conf.in | 0 .../ns1/named-https.conf.in | 0 .../ns1/named-tls.conf.in | 0 .../{transport-change => transport_change}/ns1/named.conf.in | 0 .../system/{transport-change => transport_change}/prereq.sh | 0 .../system/{transport-change => transport_change}/privkey.pem | 0 .../{transport-change => transport_change}/self-signed-cert.pem | 0 .../{transport-change => transport_change}/self-signed-key.pem | 0 .../system/{transport-change => transport_change}/setup.sh | 0 .../system/{transport-change => transport_change}/tests.sh | 0 .../tests_sh_transport_change.py | 0 154 files changed, 1 insertion(+), 1 deletion(-) rename bin/tests/system/{allow-query => allow_query}/.gitignore (100%) rename bin/tests/system/{allow-query => allow_query}/ns1/named.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns1/root.db (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/generic.db (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named01.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named02.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named03.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named04.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named05.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named06.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named07.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named08.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named09.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named10.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named11.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named12.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named21.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named22.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named23.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named24.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named25.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named26.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named27.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named28.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named29.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named30.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named31.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named32.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named33.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named34.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named40.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named53.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named54.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named55.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named56.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named57.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns3/named.args (100%) rename bin/tests/system/{allow-query => allow_query}/ns3/named1.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns3/named2.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns3/named3.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/ns3/named4.conf.in (100%) rename bin/tests/system/{allow-query => allow_query}/setup.sh (100%) rename bin/tests/system/{allow-query => allow_query}/tests.sh (100%) rename bin/tests/system/{allow-query => allow_query}/tests_sh_allow_query.py (100%) rename bin/tests/system/{dnssec-malformed-dnskey => dnssec_malformed_dnskey}/ns2/example.db.in (100%) rename bin/tests/system/{dnssec-malformed-dnskey => dnssec_malformed_dnskey}/ns2/named.conf.j2 (100%) rename bin/tests/system/{dnssec-malformed-dnskey => dnssec_malformed_dnskey}/ns2/truncated.selfsigned.db.signed (100%) rename bin/tests/system/{dnssec-malformed-dnskey => dnssec_malformed_dnskey}/ns2/trusted.conf.j2 (100%) rename bin/tests/system/{dnssec-malformed-dnskey => dnssec_malformed_dnskey}/ns3/named.conf.j2 (100%) rename bin/tests/system/{dnssec-malformed-dnskey => dnssec_malformed_dnskey}/ns3/trusted.conf.j2 (100%) rename bin/tests/system/{dnssec-malformed-dnskey => dnssec_malformed_dnskey}/tests_malformed_dnskey.py (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/.gitignore (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/conf/bad1.conf (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/conf/bad2.conf (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/conf/bad3.conf (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/conf/bad4.conf (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/conf/bad5.conf (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/conf/good1.conf (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/conf/good2.conf (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/conf/good3.conf (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/conf/good4.conf (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/conf/good5.conf (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns1/named1.conf.in (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns1/named2.conf.in (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns1/root.db (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns1/sign.sh (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns1/signed.db.in (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns1/unsigned.db (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns2/hints (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns2/named1.conf.in (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns2/named2.conf.in (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns3/hints (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns3/named1.conf.in (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns3/named2.conf.in (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns4/named1.conf.in (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns4/named2.conf.in (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns4/root.db (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns4/sign.sh (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns4/signed.db.in (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns4/unsigned.db (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns5/hints (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/ns5/named.conf.in (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/setup.sh (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/tests.sh (100%) rename bin/tests/system/{filter-aaaa => filter_aaaa}/tests_sh_filter_aaaa.py (100%) rename bin/tests/system/{include-multiplecfg => include_multiplecfg}/ns2/mars.com.db (100%) rename bin/tests/system/{include-multiplecfg => include_multiplecfg}/ns2/mars.conf (100%) rename bin/tests/system/{include-multiplecfg => include_multiplecfg}/ns2/named.conf.in (100%) rename bin/tests/system/{include-multiplecfg => include_multiplecfg}/ns2/zone1.com.db (100%) rename bin/tests/system/{include-multiplecfg => include_multiplecfg}/ns2/zone1.conf (100%) rename bin/tests/system/{include-multiplecfg => include_multiplecfg}/ns2/zone2.com.db (100%) rename bin/tests/system/{include-multiplecfg => include_multiplecfg}/ns2/zone2.conf (100%) rename bin/tests/system/{include-multiplecfg => include_multiplecfg}/setup.sh (100%) rename bin/tests/system/{include-multiplecfg => include_multiplecfg}/tests_include_multiplecfg.py (100%) rename bin/tests/system/{mirror-root-zone => mirror_root_zone}/ns1/named.conf.j2 (100%) rename bin/tests/system/{mirror-root-zone => mirror_root_zone}/tests_mirror_root_zone.py (100%) rename bin/tests/system/{nsec3-answer => nsec3_answer}/ns1/named.conf.j2 (100%) rename bin/tests/system/{nsec3-answer => nsec3_answer}/ns1/root.db.in (100%) rename bin/tests/system/{nsec3-answer => nsec3_answer}/ns1/sign.sh (100%) rename bin/tests/system/{nsec3-answer => nsec3_answer}/ns2/named.conf.j2 (100%) rename bin/tests/system/{nsec3-answer => nsec3_answer}/setup.sh (100%) rename bin/tests/system/{nsec3-answer => nsec3_answer}/tests_nsec3.py (99%) rename bin/tests/system/{serve-stale => serve_stale}/.gitignore (100%) rename bin/tests/system/{serve-stale => serve_stale}/ans2/ans.pl (100%) rename bin/tests/system/{serve-stale => serve_stale}/ans8/ans.pl (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns1/named1.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns1/named2.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns1/named3.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns1/named4.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns1/root.db (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns1/stale.test.db (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named1.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named10.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named2.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named3.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named4.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named5.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named6.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named7.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named8.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named9.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/root.db (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/serve.stale.db (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns4/named.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns5/named.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns6/named.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns6/serve.stale.db (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns6/stale.db (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns7/named.conf.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns7/named1.conf.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns7/root.db (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns7/target.stale.db (100%) rename bin/tests/system/{serve-stale => serve_stale}/prereq.sh (100%) rename bin/tests/system/{serve-stale => serve_stale}/setup.sh (100%) rename bin/tests/system/{serve-stale => serve_stale}/tests.sh (100%) rename bin/tests/system/{serve-stale => serve_stale}/tests_sh_serve_stale.py (100%) rename bin/tests/system/{transport-acl => transport_acl}/ns1/named.conf.in (100%) rename bin/tests/system/{transport-acl => transport_acl}/self-signed-cert.pem (100%) rename bin/tests/system/{transport-acl => transport_acl}/self-signed-key.pem (100%) rename bin/tests/system/{transport-acl => transport_acl}/setup.sh (100%) rename bin/tests/system/{transport-acl => transport_acl}/tests.sh (100%) rename bin/tests/system/{transport-acl => transport_acl}/tests_sh_transport_acl.py (100%) rename bin/tests/system/{transport-change => transport_change}/ns1/named-http-plain.conf.in (100%) rename bin/tests/system/{transport-change => transport_change}/ns1/named-https.conf.in (100%) rename bin/tests/system/{transport-change => transport_change}/ns1/named-tls.conf.in (100%) rename bin/tests/system/{transport-change => transport_change}/ns1/named.conf.in (100%) rename bin/tests/system/{transport-change => transport_change}/prereq.sh (100%) rename bin/tests/system/{transport-change => transport_change}/privkey.pem (100%) rename bin/tests/system/{transport-change => transport_change}/self-signed-cert.pem (100%) rename bin/tests/system/{transport-change => transport_change}/self-signed-key.pem (100%) rename bin/tests/system/{transport-change => transport_change}/setup.sh (100%) rename bin/tests/system/{transport-change => transport_change}/tests.sh (100%) rename bin/tests/system/{transport-change => transport_change}/tests_sh_transport_change.py (100%) diff --git a/bin/tests/system/allow-query/.gitignore b/bin/tests/system/allow_query/.gitignore similarity index 100% rename from bin/tests/system/allow-query/.gitignore rename to bin/tests/system/allow_query/.gitignore diff --git a/bin/tests/system/allow-query/ns1/named.conf.in b/bin/tests/system/allow_query/ns1/named.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns1/named.conf.in rename to bin/tests/system/allow_query/ns1/named.conf.in diff --git a/bin/tests/system/allow-query/ns1/root.db b/bin/tests/system/allow_query/ns1/root.db similarity index 100% rename from bin/tests/system/allow-query/ns1/root.db rename to bin/tests/system/allow_query/ns1/root.db diff --git a/bin/tests/system/allow-query/ns2/generic.db b/bin/tests/system/allow_query/ns2/generic.db similarity index 100% rename from bin/tests/system/allow-query/ns2/generic.db rename to bin/tests/system/allow_query/ns2/generic.db diff --git a/bin/tests/system/allow-query/ns2/named01.conf.in b/bin/tests/system/allow_query/ns2/named01.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named01.conf.in rename to bin/tests/system/allow_query/ns2/named01.conf.in diff --git a/bin/tests/system/allow-query/ns2/named02.conf.in b/bin/tests/system/allow_query/ns2/named02.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named02.conf.in rename to bin/tests/system/allow_query/ns2/named02.conf.in diff --git a/bin/tests/system/allow-query/ns2/named03.conf.in b/bin/tests/system/allow_query/ns2/named03.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named03.conf.in rename to bin/tests/system/allow_query/ns2/named03.conf.in diff --git a/bin/tests/system/allow-query/ns2/named04.conf.in b/bin/tests/system/allow_query/ns2/named04.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named04.conf.in rename to bin/tests/system/allow_query/ns2/named04.conf.in diff --git a/bin/tests/system/allow-query/ns2/named05.conf.in b/bin/tests/system/allow_query/ns2/named05.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named05.conf.in rename to bin/tests/system/allow_query/ns2/named05.conf.in diff --git a/bin/tests/system/allow-query/ns2/named06.conf.in b/bin/tests/system/allow_query/ns2/named06.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named06.conf.in rename to bin/tests/system/allow_query/ns2/named06.conf.in diff --git a/bin/tests/system/allow-query/ns2/named07.conf.in b/bin/tests/system/allow_query/ns2/named07.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named07.conf.in rename to bin/tests/system/allow_query/ns2/named07.conf.in diff --git a/bin/tests/system/allow-query/ns2/named08.conf.in b/bin/tests/system/allow_query/ns2/named08.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named08.conf.in rename to bin/tests/system/allow_query/ns2/named08.conf.in diff --git a/bin/tests/system/allow-query/ns2/named09.conf.in b/bin/tests/system/allow_query/ns2/named09.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named09.conf.in rename to bin/tests/system/allow_query/ns2/named09.conf.in diff --git a/bin/tests/system/allow-query/ns2/named10.conf.in b/bin/tests/system/allow_query/ns2/named10.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named10.conf.in rename to bin/tests/system/allow_query/ns2/named10.conf.in diff --git a/bin/tests/system/allow-query/ns2/named11.conf.in b/bin/tests/system/allow_query/ns2/named11.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named11.conf.in rename to bin/tests/system/allow_query/ns2/named11.conf.in diff --git a/bin/tests/system/allow-query/ns2/named12.conf.in b/bin/tests/system/allow_query/ns2/named12.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named12.conf.in rename to bin/tests/system/allow_query/ns2/named12.conf.in diff --git a/bin/tests/system/allow-query/ns2/named21.conf.in b/bin/tests/system/allow_query/ns2/named21.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named21.conf.in rename to bin/tests/system/allow_query/ns2/named21.conf.in diff --git a/bin/tests/system/allow-query/ns2/named22.conf.in b/bin/tests/system/allow_query/ns2/named22.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named22.conf.in rename to bin/tests/system/allow_query/ns2/named22.conf.in diff --git a/bin/tests/system/allow-query/ns2/named23.conf.in b/bin/tests/system/allow_query/ns2/named23.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named23.conf.in rename to bin/tests/system/allow_query/ns2/named23.conf.in diff --git a/bin/tests/system/allow-query/ns2/named24.conf.in b/bin/tests/system/allow_query/ns2/named24.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named24.conf.in rename to bin/tests/system/allow_query/ns2/named24.conf.in diff --git a/bin/tests/system/allow-query/ns2/named25.conf.in b/bin/tests/system/allow_query/ns2/named25.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named25.conf.in rename to bin/tests/system/allow_query/ns2/named25.conf.in diff --git a/bin/tests/system/allow-query/ns2/named26.conf.in b/bin/tests/system/allow_query/ns2/named26.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named26.conf.in rename to bin/tests/system/allow_query/ns2/named26.conf.in diff --git a/bin/tests/system/allow-query/ns2/named27.conf.in b/bin/tests/system/allow_query/ns2/named27.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named27.conf.in rename to bin/tests/system/allow_query/ns2/named27.conf.in diff --git a/bin/tests/system/allow-query/ns2/named28.conf.in b/bin/tests/system/allow_query/ns2/named28.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named28.conf.in rename to bin/tests/system/allow_query/ns2/named28.conf.in diff --git a/bin/tests/system/allow-query/ns2/named29.conf.in b/bin/tests/system/allow_query/ns2/named29.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named29.conf.in rename to bin/tests/system/allow_query/ns2/named29.conf.in diff --git a/bin/tests/system/allow-query/ns2/named30.conf.in b/bin/tests/system/allow_query/ns2/named30.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named30.conf.in rename to bin/tests/system/allow_query/ns2/named30.conf.in diff --git a/bin/tests/system/allow-query/ns2/named31.conf.in b/bin/tests/system/allow_query/ns2/named31.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named31.conf.in rename to bin/tests/system/allow_query/ns2/named31.conf.in diff --git a/bin/tests/system/allow-query/ns2/named32.conf.in b/bin/tests/system/allow_query/ns2/named32.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named32.conf.in rename to bin/tests/system/allow_query/ns2/named32.conf.in diff --git a/bin/tests/system/allow-query/ns2/named33.conf.in b/bin/tests/system/allow_query/ns2/named33.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named33.conf.in rename to bin/tests/system/allow_query/ns2/named33.conf.in diff --git a/bin/tests/system/allow-query/ns2/named34.conf.in b/bin/tests/system/allow_query/ns2/named34.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named34.conf.in rename to bin/tests/system/allow_query/ns2/named34.conf.in diff --git a/bin/tests/system/allow-query/ns2/named40.conf.in b/bin/tests/system/allow_query/ns2/named40.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named40.conf.in rename to bin/tests/system/allow_query/ns2/named40.conf.in diff --git a/bin/tests/system/allow-query/ns2/named53.conf.in b/bin/tests/system/allow_query/ns2/named53.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named53.conf.in rename to bin/tests/system/allow_query/ns2/named53.conf.in diff --git a/bin/tests/system/allow-query/ns2/named54.conf.in b/bin/tests/system/allow_query/ns2/named54.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named54.conf.in rename to bin/tests/system/allow_query/ns2/named54.conf.in diff --git a/bin/tests/system/allow-query/ns2/named55.conf.in b/bin/tests/system/allow_query/ns2/named55.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named55.conf.in rename to bin/tests/system/allow_query/ns2/named55.conf.in diff --git a/bin/tests/system/allow-query/ns2/named56.conf.in b/bin/tests/system/allow_query/ns2/named56.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named56.conf.in rename to bin/tests/system/allow_query/ns2/named56.conf.in diff --git a/bin/tests/system/allow-query/ns2/named57.conf.in b/bin/tests/system/allow_query/ns2/named57.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns2/named57.conf.in rename to bin/tests/system/allow_query/ns2/named57.conf.in diff --git a/bin/tests/system/allow-query/ns3/named.args b/bin/tests/system/allow_query/ns3/named.args similarity index 100% rename from bin/tests/system/allow-query/ns3/named.args rename to bin/tests/system/allow_query/ns3/named.args diff --git a/bin/tests/system/allow-query/ns3/named1.conf.in b/bin/tests/system/allow_query/ns3/named1.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns3/named1.conf.in rename to bin/tests/system/allow_query/ns3/named1.conf.in diff --git a/bin/tests/system/allow-query/ns3/named2.conf.in b/bin/tests/system/allow_query/ns3/named2.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns3/named2.conf.in rename to bin/tests/system/allow_query/ns3/named2.conf.in diff --git a/bin/tests/system/allow-query/ns3/named3.conf.in b/bin/tests/system/allow_query/ns3/named3.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns3/named3.conf.in rename to bin/tests/system/allow_query/ns3/named3.conf.in diff --git a/bin/tests/system/allow-query/ns3/named4.conf.in b/bin/tests/system/allow_query/ns3/named4.conf.in similarity index 100% rename from bin/tests/system/allow-query/ns3/named4.conf.in rename to bin/tests/system/allow_query/ns3/named4.conf.in diff --git a/bin/tests/system/allow-query/setup.sh b/bin/tests/system/allow_query/setup.sh similarity index 100% rename from bin/tests/system/allow-query/setup.sh rename to bin/tests/system/allow_query/setup.sh diff --git a/bin/tests/system/allow-query/tests.sh b/bin/tests/system/allow_query/tests.sh similarity index 100% rename from bin/tests/system/allow-query/tests.sh rename to bin/tests/system/allow_query/tests.sh diff --git a/bin/tests/system/allow-query/tests_sh_allow_query.py b/bin/tests/system/allow_query/tests_sh_allow_query.py similarity index 100% rename from bin/tests/system/allow-query/tests_sh_allow_query.py rename to bin/tests/system/allow_query/tests_sh_allow_query.py diff --git a/bin/tests/system/dnssec-malformed-dnskey/ns2/example.db.in b/bin/tests/system/dnssec_malformed_dnskey/ns2/example.db.in similarity index 100% rename from bin/tests/system/dnssec-malformed-dnskey/ns2/example.db.in rename to bin/tests/system/dnssec_malformed_dnskey/ns2/example.db.in diff --git a/bin/tests/system/dnssec-malformed-dnskey/ns2/named.conf.j2 b/bin/tests/system/dnssec_malformed_dnskey/ns2/named.conf.j2 similarity index 100% rename from bin/tests/system/dnssec-malformed-dnskey/ns2/named.conf.j2 rename to bin/tests/system/dnssec_malformed_dnskey/ns2/named.conf.j2 diff --git a/bin/tests/system/dnssec-malformed-dnskey/ns2/truncated.selfsigned.db.signed b/bin/tests/system/dnssec_malformed_dnskey/ns2/truncated.selfsigned.db.signed similarity index 100% rename from bin/tests/system/dnssec-malformed-dnskey/ns2/truncated.selfsigned.db.signed rename to bin/tests/system/dnssec_malformed_dnskey/ns2/truncated.selfsigned.db.signed diff --git a/bin/tests/system/dnssec-malformed-dnskey/ns2/trusted.conf.j2 b/bin/tests/system/dnssec_malformed_dnskey/ns2/trusted.conf.j2 similarity index 100% rename from bin/tests/system/dnssec-malformed-dnskey/ns2/trusted.conf.j2 rename to bin/tests/system/dnssec_malformed_dnskey/ns2/trusted.conf.j2 diff --git a/bin/tests/system/dnssec-malformed-dnskey/ns3/named.conf.j2 b/bin/tests/system/dnssec_malformed_dnskey/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/dnssec-malformed-dnskey/ns3/named.conf.j2 rename to bin/tests/system/dnssec_malformed_dnskey/ns3/named.conf.j2 diff --git a/bin/tests/system/dnssec-malformed-dnskey/ns3/trusted.conf.j2 b/bin/tests/system/dnssec_malformed_dnskey/ns3/trusted.conf.j2 similarity index 100% rename from bin/tests/system/dnssec-malformed-dnskey/ns3/trusted.conf.j2 rename to bin/tests/system/dnssec_malformed_dnskey/ns3/trusted.conf.j2 diff --git a/bin/tests/system/dnssec-malformed-dnskey/tests_malformed_dnskey.py b/bin/tests/system/dnssec_malformed_dnskey/tests_malformed_dnskey.py similarity index 100% rename from bin/tests/system/dnssec-malformed-dnskey/tests_malformed_dnskey.py rename to bin/tests/system/dnssec_malformed_dnskey/tests_malformed_dnskey.py diff --git a/bin/tests/system/filter-aaaa/.gitignore b/bin/tests/system/filter_aaaa/.gitignore similarity index 100% rename from bin/tests/system/filter-aaaa/.gitignore rename to bin/tests/system/filter_aaaa/.gitignore diff --git a/bin/tests/system/filter-aaaa/conf/bad1.conf b/bin/tests/system/filter_aaaa/conf/bad1.conf similarity index 100% rename from bin/tests/system/filter-aaaa/conf/bad1.conf rename to bin/tests/system/filter_aaaa/conf/bad1.conf diff --git a/bin/tests/system/filter-aaaa/conf/bad2.conf b/bin/tests/system/filter_aaaa/conf/bad2.conf similarity index 100% rename from bin/tests/system/filter-aaaa/conf/bad2.conf rename to bin/tests/system/filter_aaaa/conf/bad2.conf diff --git a/bin/tests/system/filter-aaaa/conf/bad3.conf b/bin/tests/system/filter_aaaa/conf/bad3.conf similarity index 100% rename from bin/tests/system/filter-aaaa/conf/bad3.conf rename to bin/tests/system/filter_aaaa/conf/bad3.conf diff --git a/bin/tests/system/filter-aaaa/conf/bad4.conf b/bin/tests/system/filter_aaaa/conf/bad4.conf similarity index 100% rename from bin/tests/system/filter-aaaa/conf/bad4.conf rename to bin/tests/system/filter_aaaa/conf/bad4.conf diff --git a/bin/tests/system/filter-aaaa/conf/bad5.conf b/bin/tests/system/filter_aaaa/conf/bad5.conf similarity index 100% rename from bin/tests/system/filter-aaaa/conf/bad5.conf rename to bin/tests/system/filter_aaaa/conf/bad5.conf diff --git a/bin/tests/system/filter-aaaa/conf/good1.conf b/bin/tests/system/filter_aaaa/conf/good1.conf similarity index 100% rename from bin/tests/system/filter-aaaa/conf/good1.conf rename to bin/tests/system/filter_aaaa/conf/good1.conf diff --git a/bin/tests/system/filter-aaaa/conf/good2.conf b/bin/tests/system/filter_aaaa/conf/good2.conf similarity index 100% rename from bin/tests/system/filter-aaaa/conf/good2.conf rename to bin/tests/system/filter_aaaa/conf/good2.conf diff --git a/bin/tests/system/filter-aaaa/conf/good3.conf b/bin/tests/system/filter_aaaa/conf/good3.conf similarity index 100% rename from bin/tests/system/filter-aaaa/conf/good3.conf rename to bin/tests/system/filter_aaaa/conf/good3.conf diff --git a/bin/tests/system/filter-aaaa/conf/good4.conf b/bin/tests/system/filter_aaaa/conf/good4.conf similarity index 100% rename from bin/tests/system/filter-aaaa/conf/good4.conf rename to bin/tests/system/filter_aaaa/conf/good4.conf diff --git a/bin/tests/system/filter-aaaa/conf/good5.conf b/bin/tests/system/filter_aaaa/conf/good5.conf similarity index 100% rename from bin/tests/system/filter-aaaa/conf/good5.conf rename to bin/tests/system/filter_aaaa/conf/good5.conf diff --git a/bin/tests/system/filter-aaaa/ns1/named1.conf.in b/bin/tests/system/filter_aaaa/ns1/named1.conf.in similarity index 100% rename from bin/tests/system/filter-aaaa/ns1/named1.conf.in rename to bin/tests/system/filter_aaaa/ns1/named1.conf.in diff --git a/bin/tests/system/filter-aaaa/ns1/named2.conf.in b/bin/tests/system/filter_aaaa/ns1/named2.conf.in similarity index 100% rename from bin/tests/system/filter-aaaa/ns1/named2.conf.in rename to bin/tests/system/filter_aaaa/ns1/named2.conf.in diff --git a/bin/tests/system/filter-aaaa/ns1/root.db b/bin/tests/system/filter_aaaa/ns1/root.db similarity index 100% rename from bin/tests/system/filter-aaaa/ns1/root.db rename to bin/tests/system/filter_aaaa/ns1/root.db diff --git a/bin/tests/system/filter-aaaa/ns1/sign.sh b/bin/tests/system/filter_aaaa/ns1/sign.sh similarity index 100% rename from bin/tests/system/filter-aaaa/ns1/sign.sh rename to bin/tests/system/filter_aaaa/ns1/sign.sh diff --git a/bin/tests/system/filter-aaaa/ns1/signed.db.in b/bin/tests/system/filter_aaaa/ns1/signed.db.in similarity index 100% rename from bin/tests/system/filter-aaaa/ns1/signed.db.in rename to bin/tests/system/filter_aaaa/ns1/signed.db.in diff --git a/bin/tests/system/filter-aaaa/ns1/unsigned.db b/bin/tests/system/filter_aaaa/ns1/unsigned.db similarity index 100% rename from bin/tests/system/filter-aaaa/ns1/unsigned.db rename to bin/tests/system/filter_aaaa/ns1/unsigned.db diff --git a/bin/tests/system/filter-aaaa/ns2/hints b/bin/tests/system/filter_aaaa/ns2/hints similarity index 100% rename from bin/tests/system/filter-aaaa/ns2/hints rename to bin/tests/system/filter_aaaa/ns2/hints diff --git a/bin/tests/system/filter-aaaa/ns2/named1.conf.in b/bin/tests/system/filter_aaaa/ns2/named1.conf.in similarity index 100% rename from bin/tests/system/filter-aaaa/ns2/named1.conf.in rename to bin/tests/system/filter_aaaa/ns2/named1.conf.in diff --git a/bin/tests/system/filter-aaaa/ns2/named2.conf.in b/bin/tests/system/filter_aaaa/ns2/named2.conf.in similarity index 100% rename from bin/tests/system/filter-aaaa/ns2/named2.conf.in rename to bin/tests/system/filter_aaaa/ns2/named2.conf.in diff --git a/bin/tests/system/filter-aaaa/ns3/hints b/bin/tests/system/filter_aaaa/ns3/hints similarity index 100% rename from bin/tests/system/filter-aaaa/ns3/hints rename to bin/tests/system/filter_aaaa/ns3/hints diff --git a/bin/tests/system/filter-aaaa/ns3/named1.conf.in b/bin/tests/system/filter_aaaa/ns3/named1.conf.in similarity index 100% rename from bin/tests/system/filter-aaaa/ns3/named1.conf.in rename to bin/tests/system/filter_aaaa/ns3/named1.conf.in diff --git a/bin/tests/system/filter-aaaa/ns3/named2.conf.in b/bin/tests/system/filter_aaaa/ns3/named2.conf.in similarity index 100% rename from bin/tests/system/filter-aaaa/ns3/named2.conf.in rename to bin/tests/system/filter_aaaa/ns3/named2.conf.in diff --git a/bin/tests/system/filter-aaaa/ns4/named1.conf.in b/bin/tests/system/filter_aaaa/ns4/named1.conf.in similarity index 100% rename from bin/tests/system/filter-aaaa/ns4/named1.conf.in rename to bin/tests/system/filter_aaaa/ns4/named1.conf.in diff --git a/bin/tests/system/filter-aaaa/ns4/named2.conf.in b/bin/tests/system/filter_aaaa/ns4/named2.conf.in similarity index 100% rename from bin/tests/system/filter-aaaa/ns4/named2.conf.in rename to bin/tests/system/filter_aaaa/ns4/named2.conf.in diff --git a/bin/tests/system/filter-aaaa/ns4/root.db b/bin/tests/system/filter_aaaa/ns4/root.db similarity index 100% rename from bin/tests/system/filter-aaaa/ns4/root.db rename to bin/tests/system/filter_aaaa/ns4/root.db diff --git a/bin/tests/system/filter-aaaa/ns4/sign.sh b/bin/tests/system/filter_aaaa/ns4/sign.sh similarity index 100% rename from bin/tests/system/filter-aaaa/ns4/sign.sh rename to bin/tests/system/filter_aaaa/ns4/sign.sh diff --git a/bin/tests/system/filter-aaaa/ns4/signed.db.in b/bin/tests/system/filter_aaaa/ns4/signed.db.in similarity index 100% rename from bin/tests/system/filter-aaaa/ns4/signed.db.in rename to bin/tests/system/filter_aaaa/ns4/signed.db.in diff --git a/bin/tests/system/filter-aaaa/ns4/unsigned.db b/bin/tests/system/filter_aaaa/ns4/unsigned.db similarity index 100% rename from bin/tests/system/filter-aaaa/ns4/unsigned.db rename to bin/tests/system/filter_aaaa/ns4/unsigned.db diff --git a/bin/tests/system/filter-aaaa/ns5/hints b/bin/tests/system/filter_aaaa/ns5/hints similarity index 100% rename from bin/tests/system/filter-aaaa/ns5/hints rename to bin/tests/system/filter_aaaa/ns5/hints diff --git a/bin/tests/system/filter-aaaa/ns5/named.conf.in b/bin/tests/system/filter_aaaa/ns5/named.conf.in similarity index 100% rename from bin/tests/system/filter-aaaa/ns5/named.conf.in rename to bin/tests/system/filter_aaaa/ns5/named.conf.in diff --git a/bin/tests/system/filter-aaaa/setup.sh b/bin/tests/system/filter_aaaa/setup.sh similarity index 100% rename from bin/tests/system/filter-aaaa/setup.sh rename to bin/tests/system/filter_aaaa/setup.sh diff --git a/bin/tests/system/filter-aaaa/tests.sh b/bin/tests/system/filter_aaaa/tests.sh similarity index 100% rename from bin/tests/system/filter-aaaa/tests.sh rename to bin/tests/system/filter_aaaa/tests.sh diff --git a/bin/tests/system/filter-aaaa/tests_sh_filter_aaaa.py b/bin/tests/system/filter_aaaa/tests_sh_filter_aaaa.py similarity index 100% rename from bin/tests/system/filter-aaaa/tests_sh_filter_aaaa.py rename to bin/tests/system/filter_aaaa/tests_sh_filter_aaaa.py diff --git a/bin/tests/system/include-multiplecfg/ns2/mars.com.db b/bin/tests/system/include_multiplecfg/ns2/mars.com.db similarity index 100% rename from bin/tests/system/include-multiplecfg/ns2/mars.com.db rename to bin/tests/system/include_multiplecfg/ns2/mars.com.db diff --git a/bin/tests/system/include-multiplecfg/ns2/mars.conf b/bin/tests/system/include_multiplecfg/ns2/mars.conf similarity index 100% rename from bin/tests/system/include-multiplecfg/ns2/mars.conf rename to bin/tests/system/include_multiplecfg/ns2/mars.conf diff --git a/bin/tests/system/include-multiplecfg/ns2/named.conf.in b/bin/tests/system/include_multiplecfg/ns2/named.conf.in similarity index 100% rename from bin/tests/system/include-multiplecfg/ns2/named.conf.in rename to bin/tests/system/include_multiplecfg/ns2/named.conf.in diff --git a/bin/tests/system/include-multiplecfg/ns2/zone1.com.db b/bin/tests/system/include_multiplecfg/ns2/zone1.com.db similarity index 100% rename from bin/tests/system/include-multiplecfg/ns2/zone1.com.db rename to bin/tests/system/include_multiplecfg/ns2/zone1.com.db diff --git a/bin/tests/system/include-multiplecfg/ns2/zone1.conf b/bin/tests/system/include_multiplecfg/ns2/zone1.conf similarity index 100% rename from bin/tests/system/include-multiplecfg/ns2/zone1.conf rename to bin/tests/system/include_multiplecfg/ns2/zone1.conf diff --git a/bin/tests/system/include-multiplecfg/ns2/zone2.com.db b/bin/tests/system/include_multiplecfg/ns2/zone2.com.db similarity index 100% rename from bin/tests/system/include-multiplecfg/ns2/zone2.com.db rename to bin/tests/system/include_multiplecfg/ns2/zone2.com.db diff --git a/bin/tests/system/include-multiplecfg/ns2/zone2.conf b/bin/tests/system/include_multiplecfg/ns2/zone2.conf similarity index 100% rename from bin/tests/system/include-multiplecfg/ns2/zone2.conf rename to bin/tests/system/include_multiplecfg/ns2/zone2.conf diff --git a/bin/tests/system/include-multiplecfg/setup.sh b/bin/tests/system/include_multiplecfg/setup.sh similarity index 100% rename from bin/tests/system/include-multiplecfg/setup.sh rename to bin/tests/system/include_multiplecfg/setup.sh diff --git a/bin/tests/system/include-multiplecfg/tests_include_multiplecfg.py b/bin/tests/system/include_multiplecfg/tests_include_multiplecfg.py similarity index 100% rename from bin/tests/system/include-multiplecfg/tests_include_multiplecfg.py rename to bin/tests/system/include_multiplecfg/tests_include_multiplecfg.py diff --git a/bin/tests/system/mirror-root-zone/ns1/named.conf.j2 b/bin/tests/system/mirror_root_zone/ns1/named.conf.j2 similarity index 100% rename from bin/tests/system/mirror-root-zone/ns1/named.conf.j2 rename to bin/tests/system/mirror_root_zone/ns1/named.conf.j2 diff --git a/bin/tests/system/mirror-root-zone/tests_mirror_root_zone.py b/bin/tests/system/mirror_root_zone/tests_mirror_root_zone.py similarity index 100% rename from bin/tests/system/mirror-root-zone/tests_mirror_root_zone.py rename to bin/tests/system/mirror_root_zone/tests_mirror_root_zone.py diff --git a/bin/tests/system/nsec3-answer/ns1/named.conf.j2 b/bin/tests/system/nsec3_answer/ns1/named.conf.j2 similarity index 100% rename from bin/tests/system/nsec3-answer/ns1/named.conf.j2 rename to bin/tests/system/nsec3_answer/ns1/named.conf.j2 diff --git a/bin/tests/system/nsec3-answer/ns1/root.db.in b/bin/tests/system/nsec3_answer/ns1/root.db.in similarity index 100% rename from bin/tests/system/nsec3-answer/ns1/root.db.in rename to bin/tests/system/nsec3_answer/ns1/root.db.in diff --git a/bin/tests/system/nsec3-answer/ns1/sign.sh b/bin/tests/system/nsec3_answer/ns1/sign.sh similarity index 100% rename from bin/tests/system/nsec3-answer/ns1/sign.sh rename to bin/tests/system/nsec3_answer/ns1/sign.sh diff --git a/bin/tests/system/nsec3-answer/ns2/named.conf.j2 b/bin/tests/system/nsec3_answer/ns2/named.conf.j2 similarity index 100% rename from bin/tests/system/nsec3-answer/ns2/named.conf.j2 rename to bin/tests/system/nsec3_answer/ns2/named.conf.j2 diff --git a/bin/tests/system/nsec3-answer/setup.sh b/bin/tests/system/nsec3_answer/setup.sh similarity index 100% rename from bin/tests/system/nsec3-answer/setup.sh rename to bin/tests/system/nsec3_answer/setup.sh diff --git a/bin/tests/system/nsec3-answer/tests_nsec3.py b/bin/tests/system/nsec3_answer/tests_nsec3.py similarity index 99% rename from bin/tests/system/nsec3-answer/tests_nsec3.py rename to bin/tests/system/nsec3_answer/tests_nsec3.py index 72d065e7d5..ae5f71723b 100755 --- a/bin/tests/system/nsec3-answer/tests_nsec3.py +++ b/bin/tests/system/nsec3_answer/tests_nsec3.py @@ -48,7 +48,7 @@ ZONE = isctest.name.ZoneAnalyzer.read_path( / "bin" / "tests" / "system" - / "nsec3-answer/ns1/root.db.in", + / "nsec3_answer/ns1/root.db.in", origin=SUFFIX, ) diff --git a/bin/tests/system/serve-stale/.gitignore b/bin/tests/system/serve_stale/.gitignore similarity index 100% rename from bin/tests/system/serve-stale/.gitignore rename to bin/tests/system/serve_stale/.gitignore diff --git a/bin/tests/system/serve-stale/ans2/ans.pl b/bin/tests/system/serve_stale/ans2/ans.pl similarity index 100% rename from bin/tests/system/serve-stale/ans2/ans.pl rename to bin/tests/system/serve_stale/ans2/ans.pl diff --git a/bin/tests/system/serve-stale/ans8/ans.pl b/bin/tests/system/serve_stale/ans8/ans.pl similarity index 100% rename from bin/tests/system/serve-stale/ans8/ans.pl rename to bin/tests/system/serve_stale/ans8/ans.pl diff --git a/bin/tests/system/serve-stale/ns1/named1.conf.in b/bin/tests/system/serve_stale/ns1/named1.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns1/named1.conf.in rename to bin/tests/system/serve_stale/ns1/named1.conf.in diff --git a/bin/tests/system/serve-stale/ns1/named2.conf.in b/bin/tests/system/serve_stale/ns1/named2.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns1/named2.conf.in rename to bin/tests/system/serve_stale/ns1/named2.conf.in diff --git a/bin/tests/system/serve-stale/ns1/named3.conf.in b/bin/tests/system/serve_stale/ns1/named3.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns1/named3.conf.in rename to bin/tests/system/serve_stale/ns1/named3.conf.in diff --git a/bin/tests/system/serve-stale/ns1/named4.conf.in b/bin/tests/system/serve_stale/ns1/named4.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns1/named4.conf.in rename to bin/tests/system/serve_stale/ns1/named4.conf.in diff --git a/bin/tests/system/serve-stale/ns1/root.db b/bin/tests/system/serve_stale/ns1/root.db similarity index 100% rename from bin/tests/system/serve-stale/ns1/root.db rename to bin/tests/system/serve_stale/ns1/root.db diff --git a/bin/tests/system/serve-stale/ns1/stale.test.db b/bin/tests/system/serve_stale/ns1/stale.test.db similarity index 100% rename from bin/tests/system/serve-stale/ns1/stale.test.db rename to bin/tests/system/serve_stale/ns1/stale.test.db diff --git a/bin/tests/system/serve-stale/ns3/named.conf.in b/bin/tests/system/serve_stale/ns3/named.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns3/named.conf.in rename to bin/tests/system/serve_stale/ns3/named.conf.in diff --git a/bin/tests/system/serve-stale/ns3/named1.conf.in b/bin/tests/system/serve_stale/ns3/named1.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns3/named1.conf.in rename to bin/tests/system/serve_stale/ns3/named1.conf.in diff --git a/bin/tests/system/serve-stale/ns3/named10.conf.in b/bin/tests/system/serve_stale/ns3/named10.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns3/named10.conf.in rename to bin/tests/system/serve_stale/ns3/named10.conf.in diff --git a/bin/tests/system/serve-stale/ns3/named2.conf.in b/bin/tests/system/serve_stale/ns3/named2.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns3/named2.conf.in rename to bin/tests/system/serve_stale/ns3/named2.conf.in diff --git a/bin/tests/system/serve-stale/ns3/named3.conf.in b/bin/tests/system/serve_stale/ns3/named3.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns3/named3.conf.in rename to bin/tests/system/serve_stale/ns3/named3.conf.in diff --git a/bin/tests/system/serve-stale/ns3/named4.conf.in b/bin/tests/system/serve_stale/ns3/named4.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns3/named4.conf.in rename to bin/tests/system/serve_stale/ns3/named4.conf.in diff --git a/bin/tests/system/serve-stale/ns3/named5.conf.in b/bin/tests/system/serve_stale/ns3/named5.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns3/named5.conf.in rename to bin/tests/system/serve_stale/ns3/named5.conf.in diff --git a/bin/tests/system/serve-stale/ns3/named6.conf.in b/bin/tests/system/serve_stale/ns3/named6.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns3/named6.conf.in rename to bin/tests/system/serve_stale/ns3/named6.conf.in diff --git a/bin/tests/system/serve-stale/ns3/named7.conf.in b/bin/tests/system/serve_stale/ns3/named7.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns3/named7.conf.in rename to bin/tests/system/serve_stale/ns3/named7.conf.in diff --git a/bin/tests/system/serve-stale/ns3/named8.conf.in b/bin/tests/system/serve_stale/ns3/named8.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns3/named8.conf.in rename to bin/tests/system/serve_stale/ns3/named8.conf.in diff --git a/bin/tests/system/serve-stale/ns3/named9.conf.in b/bin/tests/system/serve_stale/ns3/named9.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns3/named9.conf.in rename to bin/tests/system/serve_stale/ns3/named9.conf.in diff --git a/bin/tests/system/serve-stale/ns3/root.db b/bin/tests/system/serve_stale/ns3/root.db similarity index 100% rename from bin/tests/system/serve-stale/ns3/root.db rename to bin/tests/system/serve_stale/ns3/root.db diff --git a/bin/tests/system/serve-stale/ns3/serve.stale.db b/bin/tests/system/serve_stale/ns3/serve.stale.db similarity index 100% rename from bin/tests/system/serve-stale/ns3/serve.stale.db rename to bin/tests/system/serve_stale/ns3/serve.stale.db diff --git a/bin/tests/system/serve-stale/ns4/named.conf.in b/bin/tests/system/serve_stale/ns4/named.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns4/named.conf.in rename to bin/tests/system/serve_stale/ns4/named.conf.in diff --git a/bin/tests/system/serve-stale/ns5/named.conf.in b/bin/tests/system/serve_stale/ns5/named.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns5/named.conf.in rename to bin/tests/system/serve_stale/ns5/named.conf.in diff --git a/bin/tests/system/serve-stale/ns6/named.conf.in b/bin/tests/system/serve_stale/ns6/named.conf.in similarity index 100% rename from bin/tests/system/serve-stale/ns6/named.conf.in rename to bin/tests/system/serve_stale/ns6/named.conf.in diff --git a/bin/tests/system/serve-stale/ns6/serve.stale.db b/bin/tests/system/serve_stale/ns6/serve.stale.db similarity index 100% rename from bin/tests/system/serve-stale/ns6/serve.stale.db rename to bin/tests/system/serve_stale/ns6/serve.stale.db diff --git a/bin/tests/system/serve-stale/ns6/stale.db b/bin/tests/system/serve_stale/ns6/stale.db similarity index 100% rename from bin/tests/system/serve-stale/ns6/stale.db rename to bin/tests/system/serve_stale/ns6/stale.db diff --git a/bin/tests/system/serve-stale/ns7/named.conf.j2 b/bin/tests/system/serve_stale/ns7/named.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns7/named.conf.j2 rename to bin/tests/system/serve_stale/ns7/named.conf.j2 diff --git a/bin/tests/system/serve-stale/ns7/named1.conf.j2 b/bin/tests/system/serve_stale/ns7/named1.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns7/named1.conf.j2 rename to bin/tests/system/serve_stale/ns7/named1.conf.j2 diff --git a/bin/tests/system/serve-stale/ns7/root.db b/bin/tests/system/serve_stale/ns7/root.db similarity index 100% rename from bin/tests/system/serve-stale/ns7/root.db rename to bin/tests/system/serve_stale/ns7/root.db diff --git a/bin/tests/system/serve-stale/ns7/target.stale.db b/bin/tests/system/serve_stale/ns7/target.stale.db similarity index 100% rename from bin/tests/system/serve-stale/ns7/target.stale.db rename to bin/tests/system/serve_stale/ns7/target.stale.db diff --git a/bin/tests/system/serve-stale/prereq.sh b/bin/tests/system/serve_stale/prereq.sh similarity index 100% rename from bin/tests/system/serve-stale/prereq.sh rename to bin/tests/system/serve_stale/prereq.sh diff --git a/bin/tests/system/serve-stale/setup.sh b/bin/tests/system/serve_stale/setup.sh similarity index 100% rename from bin/tests/system/serve-stale/setup.sh rename to bin/tests/system/serve_stale/setup.sh diff --git a/bin/tests/system/serve-stale/tests.sh b/bin/tests/system/serve_stale/tests.sh similarity index 100% rename from bin/tests/system/serve-stale/tests.sh rename to bin/tests/system/serve_stale/tests.sh diff --git a/bin/tests/system/serve-stale/tests_sh_serve_stale.py b/bin/tests/system/serve_stale/tests_sh_serve_stale.py similarity index 100% rename from bin/tests/system/serve-stale/tests_sh_serve_stale.py rename to bin/tests/system/serve_stale/tests_sh_serve_stale.py diff --git a/bin/tests/system/transport-acl/ns1/named.conf.in b/bin/tests/system/transport_acl/ns1/named.conf.in similarity index 100% rename from bin/tests/system/transport-acl/ns1/named.conf.in rename to bin/tests/system/transport_acl/ns1/named.conf.in diff --git a/bin/tests/system/transport-acl/self-signed-cert.pem b/bin/tests/system/transport_acl/self-signed-cert.pem similarity index 100% rename from bin/tests/system/transport-acl/self-signed-cert.pem rename to bin/tests/system/transport_acl/self-signed-cert.pem diff --git a/bin/tests/system/transport-acl/self-signed-key.pem b/bin/tests/system/transport_acl/self-signed-key.pem similarity index 100% rename from bin/tests/system/transport-acl/self-signed-key.pem rename to bin/tests/system/transport_acl/self-signed-key.pem diff --git a/bin/tests/system/transport-acl/setup.sh b/bin/tests/system/transport_acl/setup.sh similarity index 100% rename from bin/tests/system/transport-acl/setup.sh rename to bin/tests/system/transport_acl/setup.sh diff --git a/bin/tests/system/transport-acl/tests.sh b/bin/tests/system/transport_acl/tests.sh similarity index 100% rename from bin/tests/system/transport-acl/tests.sh rename to bin/tests/system/transport_acl/tests.sh diff --git a/bin/tests/system/transport-acl/tests_sh_transport_acl.py b/bin/tests/system/transport_acl/tests_sh_transport_acl.py similarity index 100% rename from bin/tests/system/transport-acl/tests_sh_transport_acl.py rename to bin/tests/system/transport_acl/tests_sh_transport_acl.py diff --git a/bin/tests/system/transport-change/ns1/named-http-plain.conf.in b/bin/tests/system/transport_change/ns1/named-http-plain.conf.in similarity index 100% rename from bin/tests/system/transport-change/ns1/named-http-plain.conf.in rename to bin/tests/system/transport_change/ns1/named-http-plain.conf.in diff --git a/bin/tests/system/transport-change/ns1/named-https.conf.in b/bin/tests/system/transport_change/ns1/named-https.conf.in similarity index 100% rename from bin/tests/system/transport-change/ns1/named-https.conf.in rename to bin/tests/system/transport_change/ns1/named-https.conf.in diff --git a/bin/tests/system/transport-change/ns1/named-tls.conf.in b/bin/tests/system/transport_change/ns1/named-tls.conf.in similarity index 100% rename from bin/tests/system/transport-change/ns1/named-tls.conf.in rename to bin/tests/system/transport_change/ns1/named-tls.conf.in diff --git a/bin/tests/system/transport-change/ns1/named.conf.in b/bin/tests/system/transport_change/ns1/named.conf.in similarity index 100% rename from bin/tests/system/transport-change/ns1/named.conf.in rename to bin/tests/system/transport_change/ns1/named.conf.in diff --git a/bin/tests/system/transport-change/prereq.sh b/bin/tests/system/transport_change/prereq.sh similarity index 100% rename from bin/tests/system/transport-change/prereq.sh rename to bin/tests/system/transport_change/prereq.sh diff --git a/bin/tests/system/transport-change/privkey.pem b/bin/tests/system/transport_change/privkey.pem similarity index 100% rename from bin/tests/system/transport-change/privkey.pem rename to bin/tests/system/transport_change/privkey.pem diff --git a/bin/tests/system/transport-change/self-signed-cert.pem b/bin/tests/system/transport_change/self-signed-cert.pem similarity index 100% rename from bin/tests/system/transport-change/self-signed-cert.pem rename to bin/tests/system/transport_change/self-signed-cert.pem diff --git a/bin/tests/system/transport-change/self-signed-key.pem b/bin/tests/system/transport_change/self-signed-key.pem similarity index 100% rename from bin/tests/system/transport-change/self-signed-key.pem rename to bin/tests/system/transport_change/self-signed-key.pem diff --git a/bin/tests/system/transport-change/setup.sh b/bin/tests/system/transport_change/setup.sh similarity index 100% rename from bin/tests/system/transport-change/setup.sh rename to bin/tests/system/transport_change/setup.sh diff --git a/bin/tests/system/transport-change/tests.sh b/bin/tests/system/transport_change/tests.sh similarity index 100% rename from bin/tests/system/transport-change/tests.sh rename to bin/tests/system/transport_change/tests.sh diff --git a/bin/tests/system/transport-change/tests_sh_transport_change.py b/bin/tests/system/transport_change/tests_sh_transport_change.py similarity index 100% rename from bin/tests/system/transport-change/tests_sh_transport_change.py rename to bin/tests/system/transport_change/tests_sh_transport_change.py