From e40db975d9917f07da81ae01bfbe8f9cf3b0cab2 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:18:48 +0100 Subject: [PATCH] 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.j2 | 0 bin/tests/system/{allow-query => allow_query}/ns1/root.db | 0 .../system/{allow-query => allow_query}/ns2/controls.conf.j2 | 0 bin/tests/system/{allow-query => allow_query}/ns2/generic.db | 0 bin/tests/system/{allow-query => allow_query}/ns2/named.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named02.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named03.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named04.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named05.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named06.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named07.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named08.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named09.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named10.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named11.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named12.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named21.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named22.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named23.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named24.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named25.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named26.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named27.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named28.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named29.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named30.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named31.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named32.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named33.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named34.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named40.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named53.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named54.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named55.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named56.conf.j2 | 0 .../system/{allow-query => allow_query}/ns2/named57.conf.j2 | 0 bin/tests/system/{allow-query => allow_query}/ns3/named.args | 0 bin/tests/system/{allow-query => allow_query}/ns3/named.conf.j2 | 0 .../system/{allow-query => allow_query}/ns3/named2.conf.j2 | 0 .../system/{allow-query => allow_query}/ns3/named3.conf.j2 | 0 .../system/{allow-query => allow_query}/ns3/named4.conf.j2 | 0 bin/tests/system/{allow-query => allow_query}/tests.sh | 0 .../system/{allow-query => allow_query}/tests_sh_allow_query.py | 0 .../{checkconf-keys => checkconf_keys}/bad-algorithm.conf.j2 | 0 .../bad-default-algorithm.conf.j2 | 0 .../{checkconf-keys => checkconf_keys}/bad-default-kz.conf.j2 | 0 .../{checkconf-keys => checkconf_keys}/bad-keystore.conf.j2 | 0 .../{checkconf-keys => checkconf_keys}/bad-length.conf.j2 | 0 .../bad-missing-keyfile.conf.j2 | 0 .../system/{checkconf-keys => checkconf_keys}/bad-role.conf.j2 | 0 .../bad-superfluous-keyfile.conf.j2 | 0 .../{checkconf-keys => checkconf_keys}/bad-tagrange.conf.j2 | 0 .../system/{checkconf-keys => checkconf_keys}/named.conf.j2 | 0 bin/tests/system/{checkconf-keys => checkconf_keys}/setup.sh | 0 .../system/{checkconf-keys => checkconf_keys}/template.db.in | 0 .../{checkconf-keys => checkconf_keys}/tests_checkconf_keys.py | 0 .../system/{cipher-suites => cipher_suites}/ns1/named.conf.j2 | 0 .../system/{cipher-suites => cipher_suites}/ns2/named.conf.j2 | 0 .../system/{cipher-suites => cipher_suites}/ns3/named.conf.j2 | 0 .../system/{cipher-suites => cipher_suites}/ns4/named.conf.j2 | 0 .../system/{cipher-suites => cipher_suites}/ns5/named.conf.j2 | 0 bin/tests/system/{cipher-suites => cipher_suites}/prereq.sh | 0 .../{cipher-suites => cipher_suites}/self-signed-cert.pem | 0 .../system/{cipher-suites => cipher_suites}/self-signed-key.pem | 0 bin/tests/system/{cipher-suites => cipher_suites}/setup.sh | 0 .../{cipher-suites => cipher_suites}/tests_cipher_suites.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 .../ns1/named.conf.j2 | 0 .../ns1/sign.sh | 0 .../ns1/zones/root.db.in | 0 .../ns2/named.conf.j2 | 0 .../ns2/sign.sh | 0 .../ns2/zones/example.db.in | 0 .../ns3/named.conf.j2 | 0 .../ns3/sign.sh | 0 .../ns3/zones/child.example.db.in | 0 .../ns4/named.conf.j2 | 0 .../{dnssec-unsupported-ds => dnssec_unsupported_ds}/setup.sh | 0 .../tests_mixed_ds.py | 0 .../ns2/mars.com.db | 0 .../{include-multiplecfg => include_multiplecfg}/ns2/mars.conf | 0 .../ns2/named.conf.j2 | 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 .../tests_include_multiplecfg.py | 0 .../system/{ixfr-nonminimal => ixfr_nonminimal}/ans2/ans.py | 0 .../system/{ixfr-nonminimal => ixfr_nonminimal}/ans4/ans.py | 0 .../{ixfr-nonminimal => ixfr_nonminimal}/ns1/named.conf.j2 | 0 .../{ixfr-nonminimal => ixfr_nonminimal}/ns3/named.conf.j2 | 0 bin/tests/system/{ixfr-nonminimal => ixfr_nonminimal}/prereq.sh | 0 bin/tests/system/{ixfr-nonminimal => ixfr_nonminimal}/setup.sh | 0 bin/tests/system/{ixfr-nonminimal => ixfr_nonminimal}/tests.sh | 0 .../tests_sh_ixfr_nonminimal.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 +- .../system/{query-source => query_source}/ns1/named.conf.j2 | 0 bin/tests/system/{query-source => query_source}/ns1/root.db | 0 .../system/{query-source => query_source}/ns2/named.conf.j2 | 0 bin/tests/system/{query-source => query_source}/ns2/root.hint | 0 .../system/{query-source => query_source}/ns3/named.conf.j2 | 0 bin/tests/system/{query-source => query_source}/ns3/root.hint | 0 .../system/{query-source => query_source}/ns4/named.conf.j2 | 0 bin/tests/system/{query-source => query_source}/ns4/root.hint | 0 .../system/{query-source => query_source}/ns5/named.conf.j2 | 0 bin/tests/system/{query-source => query_source}/ns5/root.hint | 0 .../{query-source => query_source}/tests_querysource_none.py | 0 bin/tests/system/rollover-ksk-3crowd/ns3/kasp.conf | 1 - bin/tests/system/rollover-straight2none/ns3/kasp.conf | 1 - bin/tests/system/{rollover-algo-csk => rollover_algo_csk}/ns1 | 0 bin/tests/system/{rollover-algo-csk => rollover_algo_csk}/ns2 | 0 .../{rollover-algo-csk => rollover_algo_csk}/ns3/csk1.conf | 0 .../{rollover-algo-csk => rollover_algo_csk}/ns3/csk2.conf | 0 .../ns3/named.common.conf.j2 | 0 .../{rollover-algo-csk => rollover_algo_csk}/ns3/named.conf.j2 | 0 .../ns3/template.db.j2.manual | 0 .../ns3/trusted.conf.j2 | 0 .../tests_rollover_algo_csk_initial.py | 0 .../tests_rollover_algo_csk_reconfig.py | 0 .../system/{rollover-algo-ksk-zsk => rollover_algo_ksk_zsk}/ns1 | 0 .../system/{rollover-algo-ksk-zsk => rollover_algo_ksk_zsk}/ns2 | 0 .../ns3/kasp.conf | 0 .../ns3/named.common.conf.j2 | 0 .../ns3/named.conf.j2 | 0 .../ns3/template.db.j2.manual | 0 .../ns3/trusted.conf.j2 | 0 .../tests_rollover_algo_ksk_zsk_initial.py | 0 .../tests_rollover_algo_ksk_zsk_reconfig.py | 0 bin/tests/system/{rollover-csk-roll1 => rollover_csk_roll1}/ns1 | 0 bin/tests/system/{rollover-csk-roll1 => rollover_csk_roll1}/ns2 | 0 .../{rollover-csk-roll1 => rollover_csk_roll1}/ns3/kasp.conf | 0 .../ns3/named.common.conf.j2 | 0 .../ns3/named.conf.j2 | 0 .../ns3/template.db.j2.manual | 0 .../ns3/trusted.conf.j2 | 0 .../tests_rollover_csk_roll1.py | 0 bin/tests/system/{rollover-csk-roll2 => rollover_csk_roll2}/ns1 | 0 bin/tests/system/{rollover-csk-roll2 => rollover_csk_roll2}/ns2 | 0 .../{rollover-csk-roll2 => rollover_csk_roll2}/ns3/kasp.conf | 0 .../ns3/named.common.conf.j2 | 0 .../ns3/named.conf.j2 | 0 .../ns3/template.db.j2.manual | 0 .../ns3/trusted.conf.j2 | 0 .../tests_rollover_csk_roll2.py | 0 .../ns3/dynamic2inline.kasp.db | 0 .../ns3/named.common.conf.j2 | 0 .../ns3/named.conf.j2 | 0 .../tests_rollover_dynamic2inline.py | 0 .../{rollover-enable-dnssec => rollover_enable_dnssec}/ns1 | 0 .../{rollover-enable-dnssec => rollover_enable_dnssec}/ns2 | 0 .../ns3/kasp.conf | 0 .../ns3/named.common.conf.j2 | 0 .../ns3/named.conf.j2 | 0 .../ns3/template.db.j2.manual | 0 .../ns3/trusted.conf.j2 | 0 .../tests_rollover_enable_dnssec.py | 0 .../{rollover-going-insecure => rollover_going_insecure}/ns1 | 0 .../{rollover-going-insecure => rollover_going_insecure}/ns2 | 0 .../ns3/kasp.conf | 0 .../ns3/named.common.conf.j2 | 0 .../ns3/named.conf.j2 | 0 .../ns3/template.db.j2.manual | 0 .../ns3/trusted.conf.j2 | 0 .../tests_rollover_going_insecure_initial.py | 0 .../tests_rollover_going_insecure_reconfig.py | 0 .../system/{rollover-ksk-3crowd => rollover_ksk_3crowd}/ns1 | 0 .../system/{rollover-ksk-3crowd => rollover_ksk_3crowd}/ns2 | 0 bin/tests/system/rollover_ksk_3crowd/ns3/kasp.conf | 1 + .../ns3/named.common.conf.j2 | 0 .../ns3/named.conf.j2 | 0 .../ns3/template.db.j2.manual | 0 .../ns3/trusted.conf.j2 | 0 .../tests_rollover_three_is_a_crowd.py | 0 .../{rollover-ksk-doubleksk => rollover_ksk_doubleksk}/ns1 | 0 .../{rollover-ksk-doubleksk => rollover_ksk_doubleksk}/ns2 | 0 .../ns3/kasp.conf | 0 .../ns3/named.common.conf.j2 | 0 .../ns3/named.conf.j2 | 0 .../ns3/template.db.j2.manual | 0 .../ns3/trusted.conf.j2 | 0 .../tests_rollover_ksk_doubleksk.py | 0 .../{rollover-lifetime => rollover_lifetime}/ns3/kasp.conf.j2 | 0 .../ns3/limit-lifetime.db | 0 .../ns3/longer-lifetime.db | 0 .../ns3/named.common.conf.j2 | 0 .../{rollover-lifetime => rollover_lifetime}/ns3/named.conf.j2 | 0 .../ns3/shorter-lifetime.db | 0 .../{rollover-lifetime => rollover_lifetime}/ns3/template.db.in | 0 .../ns3/unlimit-lifetime.db | 0 .../tests_rollover_lifetime_initial.py | 0 .../tests_rollover_lifetime_reconfig.py | 0 .../ns3/kasp.conf.j2 | 0 .../ns3/named.common.conf.j2 | 0 .../ns3/named.conf.j2 | 0 .../ns3/template.db.in | 0 .../ns3/template.db.j2.manual | 0 .../tests_rollover_multisigner.py | 0 .../{rollover-straight2none => rollover_straight2none}/ns1 | 0 .../{rollover-straight2none => rollover_straight2none}/ns2 | 0 bin/tests/system/rollover_straight2none/ns3/kasp.conf | 1 + .../ns3/named.common.conf.j2 | 0 .../ns3/named.conf.j2 | 0 .../ns3/template.db.j2.manual | 0 .../ns3/trusted.conf.j2 | 0 .../tests_rollover_straight2none_initial.py | 0 .../tests_rollover_straight2none_reconfig.py | 0 .../system/{rollover-zsk-prepub => rollover_zsk_prepub}/ns1 | 0 .../system/{rollover-zsk-prepub => rollover_zsk_prepub}/ns2 | 0 .../{rollover-zsk-prepub => rollover_zsk_prepub}/ns3/kasp.conf | 0 .../ns3/named.common.conf.j2 | 0 .../ns3/named.conf.j2 | 0 .../ns3/template.db.j2.manual | 0 .../ns3/trusted.conf.j2 | 0 .../tests_rollover_zsk_prepublication.py | 0 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 bin/tests/system/{serve-stale => serve_stale}/ns1/named.conf.j2 | 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/named2.conf.j2 | 0 .../system/{serve-stale => serve_stale}/ns1/named3.conf.in | 0 .../system/{serve-stale => serve_stale}/ns1/named3.conf.j2 | 0 .../system/{serve-stale => serve_stale}/ns1/named4.conf.in | 0 .../system/{serve-stale => serve_stale}/ns1/named4.conf.j2 | 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.j2 | 0 .../system/{serve-stale => serve_stale}/ns3/named1.conf.j2 | 0 .../system/{serve-stale => serve_stale}/ns3/named2.conf.j2 | 0 .../system/{serve-stale => serve_stale}/ns3/named3.conf.j2 | 0 .../system/{serve-stale => serve_stale}/ns3/named4.conf.j2 | 0 .../system/{serve-stale => serve_stale}/ns3/named5.conf.j2 | 0 .../system/{serve-stale => serve_stale}/ns3/named6.conf.j2 | 0 .../system/{serve-stale => serve_stale}/ns3/named7.conf.j2 | 0 .../system/{serve-stale => serve_stale}/ns3/named8.conf.j2 | 0 .../system/{serve-stale => serve_stale}/ns3/named9.conf.j2 | 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.j2 | 0 bin/tests/system/{serve-stale => serve_stale}/ns5/named.conf.j2 | 0 bin/tests/system/{serve-stale => serve_stale}/ns6/named.conf.j2 | 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}/tests.sh | 0 .../system/{serve-stale => serve_stale}/tests_sh_serve_stale.py | 0 .../system/{transport-acl => transport_acl}/ns1/named.conf.j2 | 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-proxy.conf.j2 | 0 .../ns1/named-http-plain.conf.j2 | 0 .../ns1/named-https-proxy-encrypted.conf.j2 | 0 .../ns1/named-https-proxy-plain.conf.j2 | 0 .../ns1/named-https.conf.j2 | 0 .../ns1/named-proxy.conf.j2 | 0 .../ns1/named-tls-proxy-encrypted.conf.j2 | 0 .../ns1/named-tls-proxy-plain.conf.j2 | 0 .../ns1/named-tls.conf.j2 | 0 .../{transport-change => transport_change}/ns1/named.conf.j2 | 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 .../{xfer-servers-list => xfer_servers_list}/ns1/named.conf.j2 | 0 .../{xfer-servers-list => xfer_servers_list}/ns1/test.db.j2 | 0 .../{xfer-servers-list => xfer_servers_list}/ns2/named.conf.j2 | 0 .../{xfer-servers-list => xfer_servers_list}/ns3/named.conf.j2 | 0 .../{xfer-servers-list => xfer_servers_list}/ns4/named.conf.j2 | 0 .../tests_xfer_servers_list.py | 0 294 files changed, 3 insertions(+), 3 deletions(-) rename bin/tests/system/{allow-query => allow_query}/.gitignore (100%) rename bin/tests/system/{allow-query => allow_query}/ns1/named.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns1/root.db (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/controls.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/generic.db (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named02.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named03.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named04.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named05.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named06.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named07.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named08.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named09.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named10.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named11.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named12.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named21.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named22.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named23.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named24.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named25.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named26.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named27.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named28.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named29.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named30.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named31.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named32.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named33.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named34.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named40.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named53.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named54.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named55.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named56.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns2/named57.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns3/named.args (100%) rename bin/tests/system/{allow-query => allow_query}/ns3/named.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns3/named2.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns3/named3.conf.j2 (100%) rename bin/tests/system/{allow-query => allow_query}/ns3/named4.conf.j2 (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/{checkconf-keys => checkconf_keys}/bad-algorithm.conf.j2 (100%) rename bin/tests/system/{checkconf-keys => checkconf_keys}/bad-default-algorithm.conf.j2 (100%) rename bin/tests/system/{checkconf-keys => checkconf_keys}/bad-default-kz.conf.j2 (100%) rename bin/tests/system/{checkconf-keys => checkconf_keys}/bad-keystore.conf.j2 (100%) rename bin/tests/system/{checkconf-keys => checkconf_keys}/bad-length.conf.j2 (100%) rename bin/tests/system/{checkconf-keys => checkconf_keys}/bad-missing-keyfile.conf.j2 (100%) rename bin/tests/system/{checkconf-keys => checkconf_keys}/bad-role.conf.j2 (100%) rename bin/tests/system/{checkconf-keys => checkconf_keys}/bad-superfluous-keyfile.conf.j2 (100%) rename bin/tests/system/{checkconf-keys => checkconf_keys}/bad-tagrange.conf.j2 (100%) rename bin/tests/system/{checkconf-keys => checkconf_keys}/named.conf.j2 (100%) rename bin/tests/system/{checkconf-keys => checkconf_keys}/setup.sh (100%) rename bin/tests/system/{checkconf-keys => checkconf_keys}/template.db.in (100%) rename bin/tests/system/{checkconf-keys => checkconf_keys}/tests_checkconf_keys.py (100%) rename bin/tests/system/{cipher-suites => cipher_suites}/ns1/named.conf.j2 (100%) rename bin/tests/system/{cipher-suites => cipher_suites}/ns2/named.conf.j2 (100%) rename bin/tests/system/{cipher-suites => cipher_suites}/ns3/named.conf.j2 (100%) rename bin/tests/system/{cipher-suites => cipher_suites}/ns4/named.conf.j2 (100%) rename bin/tests/system/{cipher-suites => cipher_suites}/ns5/named.conf.j2 (100%) rename bin/tests/system/{cipher-suites => cipher_suites}/prereq.sh (100%) rename bin/tests/system/{cipher-suites => cipher_suites}/self-signed-cert.pem (100%) rename bin/tests/system/{cipher-suites => cipher_suites}/self-signed-key.pem (100%) rename bin/tests/system/{cipher-suites => cipher_suites}/setup.sh (100%) rename bin/tests/system/{cipher-suites => cipher_suites}/tests_cipher_suites.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/{dnssec-unsupported-ds => dnssec_unsupported_ds}/ns1/named.conf.j2 (100%) rename bin/tests/system/{dnssec-unsupported-ds => dnssec_unsupported_ds}/ns1/sign.sh (100%) rename bin/tests/system/{dnssec-unsupported-ds => dnssec_unsupported_ds}/ns1/zones/root.db.in (100%) rename bin/tests/system/{dnssec-unsupported-ds => dnssec_unsupported_ds}/ns2/named.conf.j2 (100%) rename bin/tests/system/{dnssec-unsupported-ds => dnssec_unsupported_ds}/ns2/sign.sh (100%) rename bin/tests/system/{dnssec-unsupported-ds => dnssec_unsupported_ds}/ns2/zones/example.db.in (100%) rename bin/tests/system/{dnssec-unsupported-ds => dnssec_unsupported_ds}/ns3/named.conf.j2 (100%) rename bin/tests/system/{dnssec-unsupported-ds => dnssec_unsupported_ds}/ns3/sign.sh (100%) rename bin/tests/system/{dnssec-unsupported-ds => dnssec_unsupported_ds}/ns3/zones/child.example.db.in (100%) rename bin/tests/system/{dnssec-unsupported-ds => dnssec_unsupported_ds}/ns4/named.conf.j2 (100%) rename bin/tests/system/{dnssec-unsupported-ds => dnssec_unsupported_ds}/setup.sh (100%) rename bin/tests/system/{dnssec-unsupported-ds => dnssec_unsupported_ds}/tests_mixed_ds.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.j2 (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}/tests_include_multiplecfg.py (100%) rename bin/tests/system/{ixfr-nonminimal => ixfr_nonminimal}/ans2/ans.py (100%) rename bin/tests/system/{ixfr-nonminimal => ixfr_nonminimal}/ans4/ans.py (100%) rename bin/tests/system/{ixfr-nonminimal => ixfr_nonminimal}/ns1/named.conf.j2 (100%) rename bin/tests/system/{ixfr-nonminimal => ixfr_nonminimal}/ns3/named.conf.j2 (100%) rename bin/tests/system/{ixfr-nonminimal => ixfr_nonminimal}/prereq.sh (100%) rename bin/tests/system/{ixfr-nonminimal => ixfr_nonminimal}/setup.sh (100%) rename bin/tests/system/{ixfr-nonminimal => ixfr_nonminimal}/tests.sh (100%) rename bin/tests/system/{ixfr-nonminimal => ixfr_nonminimal}/tests_sh_ixfr_nonminimal.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/{query-source => query_source}/ns1/named.conf.j2 (100%) rename bin/tests/system/{query-source => query_source}/ns1/root.db (100%) rename bin/tests/system/{query-source => query_source}/ns2/named.conf.j2 (100%) rename bin/tests/system/{query-source => query_source}/ns2/root.hint (100%) rename bin/tests/system/{query-source => query_source}/ns3/named.conf.j2 (100%) rename bin/tests/system/{query-source => query_source}/ns3/root.hint (100%) rename bin/tests/system/{query-source => query_source}/ns4/named.conf.j2 (100%) rename bin/tests/system/{query-source => query_source}/ns4/root.hint (100%) rename bin/tests/system/{query-source => query_source}/ns5/named.conf.j2 (100%) rename bin/tests/system/{query-source => query_source}/ns5/root.hint (100%) rename bin/tests/system/{query-source => query_source}/tests_querysource_none.py (100%) delete mode 120000 bin/tests/system/rollover-ksk-3crowd/ns3/kasp.conf delete mode 120000 bin/tests/system/rollover-straight2none/ns3/kasp.conf rename bin/tests/system/{rollover-algo-csk => rollover_algo_csk}/ns1 (100%) rename bin/tests/system/{rollover-algo-csk => rollover_algo_csk}/ns2 (100%) rename bin/tests/system/{rollover-algo-csk => rollover_algo_csk}/ns3/csk1.conf (100%) rename bin/tests/system/{rollover-algo-csk => rollover_algo_csk}/ns3/csk2.conf (100%) rename bin/tests/system/{rollover-algo-csk => rollover_algo_csk}/ns3/named.common.conf.j2 (100%) rename bin/tests/system/{rollover-algo-csk => rollover_algo_csk}/ns3/named.conf.j2 (100%) rename bin/tests/system/{rollover-algo-csk => rollover_algo_csk}/ns3/template.db.j2.manual (100%) rename bin/tests/system/{rollover-algo-csk => rollover_algo_csk}/ns3/trusted.conf.j2 (100%) rename bin/tests/system/{rollover-algo-csk => rollover_algo_csk}/tests_rollover_algo_csk_initial.py (100%) rename bin/tests/system/{rollover-algo-csk => rollover_algo_csk}/tests_rollover_algo_csk_reconfig.py (100%) rename bin/tests/system/{rollover-algo-ksk-zsk => rollover_algo_ksk_zsk}/ns1 (100%) rename bin/tests/system/{rollover-algo-ksk-zsk => rollover_algo_ksk_zsk}/ns2 (100%) rename bin/tests/system/{rollover-algo-ksk-zsk => rollover_algo_ksk_zsk}/ns3/kasp.conf (100%) rename bin/tests/system/{rollover-algo-ksk-zsk => rollover_algo_ksk_zsk}/ns3/named.common.conf.j2 (100%) rename bin/tests/system/{rollover-algo-ksk-zsk => rollover_algo_ksk_zsk}/ns3/named.conf.j2 (100%) rename bin/tests/system/{rollover-algo-ksk-zsk => rollover_algo_ksk_zsk}/ns3/template.db.j2.manual (100%) rename bin/tests/system/{rollover-algo-ksk-zsk => rollover_algo_ksk_zsk}/ns3/trusted.conf.j2 (100%) rename bin/tests/system/{rollover-algo-ksk-zsk => rollover_algo_ksk_zsk}/tests_rollover_algo_ksk_zsk_initial.py (100%) rename bin/tests/system/{rollover-algo-ksk-zsk => rollover_algo_ksk_zsk}/tests_rollover_algo_ksk_zsk_reconfig.py (100%) rename bin/tests/system/{rollover-csk-roll1 => rollover_csk_roll1}/ns1 (100%) rename bin/tests/system/{rollover-csk-roll1 => rollover_csk_roll1}/ns2 (100%) rename bin/tests/system/{rollover-csk-roll1 => rollover_csk_roll1}/ns3/kasp.conf (100%) rename bin/tests/system/{rollover-csk-roll1 => rollover_csk_roll1}/ns3/named.common.conf.j2 (100%) rename bin/tests/system/{rollover-csk-roll1 => rollover_csk_roll1}/ns3/named.conf.j2 (100%) rename bin/tests/system/{rollover-csk-roll1 => rollover_csk_roll1}/ns3/template.db.j2.manual (100%) rename bin/tests/system/{rollover-csk-roll1 => rollover_csk_roll1}/ns3/trusted.conf.j2 (100%) rename bin/tests/system/{rollover-csk-roll1 => rollover_csk_roll1}/tests_rollover_csk_roll1.py (100%) rename bin/tests/system/{rollover-csk-roll2 => rollover_csk_roll2}/ns1 (100%) rename bin/tests/system/{rollover-csk-roll2 => rollover_csk_roll2}/ns2 (100%) rename bin/tests/system/{rollover-csk-roll2 => rollover_csk_roll2}/ns3/kasp.conf (100%) rename bin/tests/system/{rollover-csk-roll2 => rollover_csk_roll2}/ns3/named.common.conf.j2 (100%) rename bin/tests/system/{rollover-csk-roll2 => rollover_csk_roll2}/ns3/named.conf.j2 (100%) rename bin/tests/system/{rollover-csk-roll2 => rollover_csk_roll2}/ns3/template.db.j2.manual (100%) rename bin/tests/system/{rollover-csk-roll2 => rollover_csk_roll2}/ns3/trusted.conf.j2 (100%) rename bin/tests/system/{rollover-csk-roll2 => rollover_csk_roll2}/tests_rollover_csk_roll2.py (100%) rename bin/tests/system/{rollover-dynamic2inline => rollover_dynamic2inline}/ns3/dynamic2inline.kasp.db (100%) rename bin/tests/system/{rollover-dynamic2inline => rollover_dynamic2inline}/ns3/named.common.conf.j2 (100%) rename bin/tests/system/{rollover-dynamic2inline => rollover_dynamic2inline}/ns3/named.conf.j2 (100%) rename bin/tests/system/{rollover-dynamic2inline => rollover_dynamic2inline}/tests_rollover_dynamic2inline.py (100%) rename bin/tests/system/{rollover-enable-dnssec => rollover_enable_dnssec}/ns1 (100%) rename bin/tests/system/{rollover-enable-dnssec => rollover_enable_dnssec}/ns2 (100%) rename bin/tests/system/{rollover-enable-dnssec => rollover_enable_dnssec}/ns3/kasp.conf (100%) rename bin/tests/system/{rollover-enable-dnssec => rollover_enable_dnssec}/ns3/named.common.conf.j2 (100%) rename bin/tests/system/{rollover-enable-dnssec => rollover_enable_dnssec}/ns3/named.conf.j2 (100%) rename bin/tests/system/{rollover-enable-dnssec => rollover_enable_dnssec}/ns3/template.db.j2.manual (100%) rename bin/tests/system/{rollover-enable-dnssec => rollover_enable_dnssec}/ns3/trusted.conf.j2 (100%) rename bin/tests/system/{rollover-enable-dnssec => rollover_enable_dnssec}/tests_rollover_enable_dnssec.py (100%) rename bin/tests/system/{rollover-going-insecure => rollover_going_insecure}/ns1 (100%) rename bin/tests/system/{rollover-going-insecure => rollover_going_insecure}/ns2 (100%) rename bin/tests/system/{rollover-going-insecure => rollover_going_insecure}/ns3/kasp.conf (100%) rename bin/tests/system/{rollover-going-insecure => rollover_going_insecure}/ns3/named.common.conf.j2 (100%) rename bin/tests/system/{rollover-going-insecure => rollover_going_insecure}/ns3/named.conf.j2 (100%) rename bin/tests/system/{rollover-going-insecure => rollover_going_insecure}/ns3/template.db.j2.manual (100%) rename bin/tests/system/{rollover-going-insecure => rollover_going_insecure}/ns3/trusted.conf.j2 (100%) rename bin/tests/system/{rollover-going-insecure => rollover_going_insecure}/tests_rollover_going_insecure_initial.py (100%) rename bin/tests/system/{rollover-going-insecure => rollover_going_insecure}/tests_rollover_going_insecure_reconfig.py (100%) rename bin/tests/system/{rollover-ksk-3crowd => rollover_ksk_3crowd}/ns1 (100%) rename bin/tests/system/{rollover-ksk-3crowd => rollover_ksk_3crowd}/ns2 (100%) create mode 120000 bin/tests/system/rollover_ksk_3crowd/ns3/kasp.conf rename bin/tests/system/{rollover-ksk-3crowd => rollover_ksk_3crowd}/ns3/named.common.conf.j2 (100%) rename bin/tests/system/{rollover-ksk-3crowd => rollover_ksk_3crowd}/ns3/named.conf.j2 (100%) rename bin/tests/system/{rollover-ksk-3crowd => rollover_ksk_3crowd}/ns3/template.db.j2.manual (100%) rename bin/tests/system/{rollover-ksk-3crowd => rollover_ksk_3crowd}/ns3/trusted.conf.j2 (100%) rename bin/tests/system/{rollover-ksk-3crowd => rollover_ksk_3crowd}/tests_rollover_three_is_a_crowd.py (100%) rename bin/tests/system/{rollover-ksk-doubleksk => rollover_ksk_doubleksk}/ns1 (100%) rename bin/tests/system/{rollover-ksk-doubleksk => rollover_ksk_doubleksk}/ns2 (100%) rename bin/tests/system/{rollover-ksk-doubleksk => rollover_ksk_doubleksk}/ns3/kasp.conf (100%) rename bin/tests/system/{rollover-ksk-doubleksk => rollover_ksk_doubleksk}/ns3/named.common.conf.j2 (100%) rename bin/tests/system/{rollover-ksk-doubleksk => rollover_ksk_doubleksk}/ns3/named.conf.j2 (100%) rename bin/tests/system/{rollover-ksk-doubleksk => rollover_ksk_doubleksk}/ns3/template.db.j2.manual (100%) rename bin/tests/system/{rollover-ksk-doubleksk => rollover_ksk_doubleksk}/ns3/trusted.conf.j2 (100%) rename bin/tests/system/{rollover-ksk-doubleksk => rollover_ksk_doubleksk}/tests_rollover_ksk_doubleksk.py (100%) rename bin/tests/system/{rollover-lifetime => rollover_lifetime}/ns3/kasp.conf.j2 (100%) rename bin/tests/system/{rollover-lifetime => rollover_lifetime}/ns3/limit-lifetime.db (100%) rename bin/tests/system/{rollover-lifetime => rollover_lifetime}/ns3/longer-lifetime.db (100%) rename bin/tests/system/{rollover-lifetime => rollover_lifetime}/ns3/named.common.conf.j2 (100%) rename bin/tests/system/{rollover-lifetime => rollover_lifetime}/ns3/named.conf.j2 (100%) rename bin/tests/system/{rollover-lifetime => rollover_lifetime}/ns3/shorter-lifetime.db (100%) rename bin/tests/system/{rollover-lifetime => rollover_lifetime}/ns3/template.db.in (100%) rename bin/tests/system/{rollover-lifetime => rollover_lifetime}/ns3/unlimit-lifetime.db (100%) rename bin/tests/system/{rollover-lifetime => rollover_lifetime}/tests_rollover_lifetime_initial.py (100%) rename bin/tests/system/{rollover-lifetime => rollover_lifetime}/tests_rollover_lifetime_reconfig.py (100%) rename bin/tests/system/{rollover-multisigner => rollover_multisigner}/ns3/kasp.conf.j2 (100%) rename bin/tests/system/{rollover-multisigner => rollover_multisigner}/ns3/named.common.conf.j2 (100%) rename bin/tests/system/{rollover-multisigner => rollover_multisigner}/ns3/named.conf.j2 (100%) rename bin/tests/system/{rollover-multisigner => rollover_multisigner}/ns3/template.db.in (100%) rename bin/tests/system/{rollover-multisigner => rollover_multisigner}/ns3/template.db.j2.manual (100%) rename bin/tests/system/{rollover-multisigner => rollover_multisigner}/tests_rollover_multisigner.py (100%) rename bin/tests/system/{rollover-straight2none => rollover_straight2none}/ns1 (100%) rename bin/tests/system/{rollover-straight2none => rollover_straight2none}/ns2 (100%) create mode 120000 bin/tests/system/rollover_straight2none/ns3/kasp.conf rename bin/tests/system/{rollover-straight2none => rollover_straight2none}/ns3/named.common.conf.j2 (100%) rename bin/tests/system/{rollover-straight2none => rollover_straight2none}/ns3/named.conf.j2 (100%) rename bin/tests/system/{rollover-straight2none => rollover_straight2none}/ns3/template.db.j2.manual (100%) rename bin/tests/system/{rollover-straight2none => rollover_straight2none}/ns3/trusted.conf.j2 (100%) rename bin/tests/system/{rollover-straight2none => rollover_straight2none}/tests_rollover_straight2none_initial.py (100%) rename bin/tests/system/{rollover-straight2none => rollover_straight2none}/tests_rollover_straight2none_reconfig.py (100%) rename bin/tests/system/{rollover-zsk-prepub => rollover_zsk_prepub}/ns1 (100%) rename bin/tests/system/{rollover-zsk-prepub => rollover_zsk_prepub}/ns2 (100%) rename bin/tests/system/{rollover-zsk-prepub => rollover_zsk_prepub}/ns3/kasp.conf (100%) rename bin/tests/system/{rollover-zsk-prepub => rollover_zsk_prepub}/ns3/named.common.conf.j2 (100%) rename bin/tests/system/{rollover-zsk-prepub => rollover_zsk_prepub}/ns3/named.conf.j2 (100%) rename bin/tests/system/{rollover-zsk-prepub => rollover_zsk_prepub}/ns3/template.db.j2.manual (100%) rename bin/tests/system/{rollover-zsk-prepub => rollover_zsk_prepub}/ns3/trusted.conf.j2 (100%) rename bin/tests/system/{rollover-zsk-prepub => rollover_zsk_prepub}/tests_rollover_zsk_prepublication.py (100%) 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/named.conf.j2 (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/named2.conf.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns1/named3.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns1/named3.conf.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns1/named4.conf.in (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns1/named4.conf.j2 (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.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named1.conf.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named2.conf.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named3.conf.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named4.conf.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named5.conf.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named6.conf.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named7.conf.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named8.conf.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns3/named9.conf.j2 (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.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns5/named.conf.j2 (100%) rename bin/tests/system/{serve-stale => serve_stale}/ns6/named.conf.j2 (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}/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.j2 (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-proxy.conf.j2 (100%) rename bin/tests/system/{transport-change => transport_change}/ns1/named-http-plain.conf.j2 (100%) rename bin/tests/system/{transport-change => transport_change}/ns1/named-https-proxy-encrypted.conf.j2 (100%) rename bin/tests/system/{transport-change => transport_change}/ns1/named-https-proxy-plain.conf.j2 (100%) rename bin/tests/system/{transport-change => transport_change}/ns1/named-https.conf.j2 (100%) rename bin/tests/system/{transport-change => transport_change}/ns1/named-proxy.conf.j2 (100%) rename bin/tests/system/{transport-change => transport_change}/ns1/named-tls-proxy-encrypted.conf.j2 (100%) rename bin/tests/system/{transport-change => transport_change}/ns1/named-tls-proxy-plain.conf.j2 (100%) rename bin/tests/system/{transport-change => transport_change}/ns1/named-tls.conf.j2 (100%) rename bin/tests/system/{transport-change => transport_change}/ns1/named.conf.j2 (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%) rename bin/tests/system/{xfer-servers-list => xfer_servers_list}/ns1/named.conf.j2 (100%) rename bin/tests/system/{xfer-servers-list => xfer_servers_list}/ns1/test.db.j2 (100%) rename bin/tests/system/{xfer-servers-list => xfer_servers_list}/ns2/named.conf.j2 (100%) rename bin/tests/system/{xfer-servers-list => xfer_servers_list}/ns3/named.conf.j2 (100%) rename bin/tests/system/{xfer-servers-list => xfer_servers_list}/ns4/named.conf.j2 (100%) rename bin/tests/system/{xfer-servers-list => xfer_servers_list}/tests_xfer_servers_list.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.j2 b/bin/tests/system/allow_query/ns1/named.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns1/named.conf.j2 rename to bin/tests/system/allow_query/ns1/named.conf.j2 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/controls.conf.j2 b/bin/tests/system/allow_query/ns2/controls.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/controls.conf.j2 rename to bin/tests/system/allow_query/ns2/controls.conf.j2 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/named.conf.j2 b/bin/tests/system/allow_query/ns2/named.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named.conf.j2 rename to bin/tests/system/allow_query/ns2/named.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named02.conf.j2 b/bin/tests/system/allow_query/ns2/named02.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named02.conf.j2 rename to bin/tests/system/allow_query/ns2/named02.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named03.conf.j2 b/bin/tests/system/allow_query/ns2/named03.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named03.conf.j2 rename to bin/tests/system/allow_query/ns2/named03.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named04.conf.j2 b/bin/tests/system/allow_query/ns2/named04.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named04.conf.j2 rename to bin/tests/system/allow_query/ns2/named04.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named05.conf.j2 b/bin/tests/system/allow_query/ns2/named05.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named05.conf.j2 rename to bin/tests/system/allow_query/ns2/named05.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named06.conf.j2 b/bin/tests/system/allow_query/ns2/named06.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named06.conf.j2 rename to bin/tests/system/allow_query/ns2/named06.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named07.conf.j2 b/bin/tests/system/allow_query/ns2/named07.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named07.conf.j2 rename to bin/tests/system/allow_query/ns2/named07.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named08.conf.j2 b/bin/tests/system/allow_query/ns2/named08.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named08.conf.j2 rename to bin/tests/system/allow_query/ns2/named08.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named09.conf.j2 b/bin/tests/system/allow_query/ns2/named09.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named09.conf.j2 rename to bin/tests/system/allow_query/ns2/named09.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named10.conf.j2 b/bin/tests/system/allow_query/ns2/named10.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named10.conf.j2 rename to bin/tests/system/allow_query/ns2/named10.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named11.conf.j2 b/bin/tests/system/allow_query/ns2/named11.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named11.conf.j2 rename to bin/tests/system/allow_query/ns2/named11.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named12.conf.j2 b/bin/tests/system/allow_query/ns2/named12.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named12.conf.j2 rename to bin/tests/system/allow_query/ns2/named12.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named21.conf.j2 b/bin/tests/system/allow_query/ns2/named21.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named21.conf.j2 rename to bin/tests/system/allow_query/ns2/named21.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named22.conf.j2 b/bin/tests/system/allow_query/ns2/named22.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named22.conf.j2 rename to bin/tests/system/allow_query/ns2/named22.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named23.conf.j2 b/bin/tests/system/allow_query/ns2/named23.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named23.conf.j2 rename to bin/tests/system/allow_query/ns2/named23.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named24.conf.j2 b/bin/tests/system/allow_query/ns2/named24.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named24.conf.j2 rename to bin/tests/system/allow_query/ns2/named24.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named25.conf.j2 b/bin/tests/system/allow_query/ns2/named25.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named25.conf.j2 rename to bin/tests/system/allow_query/ns2/named25.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named26.conf.j2 b/bin/tests/system/allow_query/ns2/named26.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named26.conf.j2 rename to bin/tests/system/allow_query/ns2/named26.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named27.conf.j2 b/bin/tests/system/allow_query/ns2/named27.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named27.conf.j2 rename to bin/tests/system/allow_query/ns2/named27.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named28.conf.j2 b/bin/tests/system/allow_query/ns2/named28.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named28.conf.j2 rename to bin/tests/system/allow_query/ns2/named28.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named29.conf.j2 b/bin/tests/system/allow_query/ns2/named29.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named29.conf.j2 rename to bin/tests/system/allow_query/ns2/named29.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named30.conf.j2 b/bin/tests/system/allow_query/ns2/named30.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named30.conf.j2 rename to bin/tests/system/allow_query/ns2/named30.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named31.conf.j2 b/bin/tests/system/allow_query/ns2/named31.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named31.conf.j2 rename to bin/tests/system/allow_query/ns2/named31.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named32.conf.j2 b/bin/tests/system/allow_query/ns2/named32.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named32.conf.j2 rename to bin/tests/system/allow_query/ns2/named32.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named33.conf.j2 b/bin/tests/system/allow_query/ns2/named33.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named33.conf.j2 rename to bin/tests/system/allow_query/ns2/named33.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named34.conf.j2 b/bin/tests/system/allow_query/ns2/named34.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named34.conf.j2 rename to bin/tests/system/allow_query/ns2/named34.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named40.conf.j2 b/bin/tests/system/allow_query/ns2/named40.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named40.conf.j2 rename to bin/tests/system/allow_query/ns2/named40.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named53.conf.j2 b/bin/tests/system/allow_query/ns2/named53.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named53.conf.j2 rename to bin/tests/system/allow_query/ns2/named53.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named54.conf.j2 b/bin/tests/system/allow_query/ns2/named54.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named54.conf.j2 rename to bin/tests/system/allow_query/ns2/named54.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named55.conf.j2 b/bin/tests/system/allow_query/ns2/named55.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named55.conf.j2 rename to bin/tests/system/allow_query/ns2/named55.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named56.conf.j2 b/bin/tests/system/allow_query/ns2/named56.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named56.conf.j2 rename to bin/tests/system/allow_query/ns2/named56.conf.j2 diff --git a/bin/tests/system/allow-query/ns2/named57.conf.j2 b/bin/tests/system/allow_query/ns2/named57.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns2/named57.conf.j2 rename to bin/tests/system/allow_query/ns2/named57.conf.j2 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/named.conf.j2 b/bin/tests/system/allow_query/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns3/named.conf.j2 rename to bin/tests/system/allow_query/ns3/named.conf.j2 diff --git a/bin/tests/system/allow-query/ns3/named2.conf.j2 b/bin/tests/system/allow_query/ns3/named2.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns3/named2.conf.j2 rename to bin/tests/system/allow_query/ns3/named2.conf.j2 diff --git a/bin/tests/system/allow-query/ns3/named3.conf.j2 b/bin/tests/system/allow_query/ns3/named3.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns3/named3.conf.j2 rename to bin/tests/system/allow_query/ns3/named3.conf.j2 diff --git a/bin/tests/system/allow-query/ns3/named4.conf.j2 b/bin/tests/system/allow_query/ns3/named4.conf.j2 similarity index 100% rename from bin/tests/system/allow-query/ns3/named4.conf.j2 rename to bin/tests/system/allow_query/ns3/named4.conf.j2 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/checkconf-keys/bad-algorithm.conf.j2 b/bin/tests/system/checkconf_keys/bad-algorithm.conf.j2 similarity index 100% rename from bin/tests/system/checkconf-keys/bad-algorithm.conf.j2 rename to bin/tests/system/checkconf_keys/bad-algorithm.conf.j2 diff --git a/bin/tests/system/checkconf-keys/bad-default-algorithm.conf.j2 b/bin/tests/system/checkconf_keys/bad-default-algorithm.conf.j2 similarity index 100% rename from bin/tests/system/checkconf-keys/bad-default-algorithm.conf.j2 rename to bin/tests/system/checkconf_keys/bad-default-algorithm.conf.j2 diff --git a/bin/tests/system/checkconf-keys/bad-default-kz.conf.j2 b/bin/tests/system/checkconf_keys/bad-default-kz.conf.j2 similarity index 100% rename from bin/tests/system/checkconf-keys/bad-default-kz.conf.j2 rename to bin/tests/system/checkconf_keys/bad-default-kz.conf.j2 diff --git a/bin/tests/system/checkconf-keys/bad-keystore.conf.j2 b/bin/tests/system/checkconf_keys/bad-keystore.conf.j2 similarity index 100% rename from bin/tests/system/checkconf-keys/bad-keystore.conf.j2 rename to bin/tests/system/checkconf_keys/bad-keystore.conf.j2 diff --git a/bin/tests/system/checkconf-keys/bad-length.conf.j2 b/bin/tests/system/checkconf_keys/bad-length.conf.j2 similarity index 100% rename from bin/tests/system/checkconf-keys/bad-length.conf.j2 rename to bin/tests/system/checkconf_keys/bad-length.conf.j2 diff --git a/bin/tests/system/checkconf-keys/bad-missing-keyfile.conf.j2 b/bin/tests/system/checkconf_keys/bad-missing-keyfile.conf.j2 similarity index 100% rename from bin/tests/system/checkconf-keys/bad-missing-keyfile.conf.j2 rename to bin/tests/system/checkconf_keys/bad-missing-keyfile.conf.j2 diff --git a/bin/tests/system/checkconf-keys/bad-role.conf.j2 b/bin/tests/system/checkconf_keys/bad-role.conf.j2 similarity index 100% rename from bin/tests/system/checkconf-keys/bad-role.conf.j2 rename to bin/tests/system/checkconf_keys/bad-role.conf.j2 diff --git a/bin/tests/system/checkconf-keys/bad-superfluous-keyfile.conf.j2 b/bin/tests/system/checkconf_keys/bad-superfluous-keyfile.conf.j2 similarity index 100% rename from bin/tests/system/checkconf-keys/bad-superfluous-keyfile.conf.j2 rename to bin/tests/system/checkconf_keys/bad-superfluous-keyfile.conf.j2 diff --git a/bin/tests/system/checkconf-keys/bad-tagrange.conf.j2 b/bin/tests/system/checkconf_keys/bad-tagrange.conf.j2 similarity index 100% rename from bin/tests/system/checkconf-keys/bad-tagrange.conf.j2 rename to bin/tests/system/checkconf_keys/bad-tagrange.conf.j2 diff --git a/bin/tests/system/checkconf-keys/named.conf.j2 b/bin/tests/system/checkconf_keys/named.conf.j2 similarity index 100% rename from bin/tests/system/checkconf-keys/named.conf.j2 rename to bin/tests/system/checkconf_keys/named.conf.j2 diff --git a/bin/tests/system/checkconf-keys/setup.sh b/bin/tests/system/checkconf_keys/setup.sh similarity index 100% rename from bin/tests/system/checkconf-keys/setup.sh rename to bin/tests/system/checkconf_keys/setup.sh diff --git a/bin/tests/system/checkconf-keys/template.db.in b/bin/tests/system/checkconf_keys/template.db.in similarity index 100% rename from bin/tests/system/checkconf-keys/template.db.in rename to bin/tests/system/checkconf_keys/template.db.in diff --git a/bin/tests/system/checkconf-keys/tests_checkconf_keys.py b/bin/tests/system/checkconf_keys/tests_checkconf_keys.py similarity index 100% rename from bin/tests/system/checkconf-keys/tests_checkconf_keys.py rename to bin/tests/system/checkconf_keys/tests_checkconf_keys.py diff --git a/bin/tests/system/cipher-suites/ns1/named.conf.j2 b/bin/tests/system/cipher_suites/ns1/named.conf.j2 similarity index 100% rename from bin/tests/system/cipher-suites/ns1/named.conf.j2 rename to bin/tests/system/cipher_suites/ns1/named.conf.j2 diff --git a/bin/tests/system/cipher-suites/ns2/named.conf.j2 b/bin/tests/system/cipher_suites/ns2/named.conf.j2 similarity index 100% rename from bin/tests/system/cipher-suites/ns2/named.conf.j2 rename to bin/tests/system/cipher_suites/ns2/named.conf.j2 diff --git a/bin/tests/system/cipher-suites/ns3/named.conf.j2 b/bin/tests/system/cipher_suites/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/cipher-suites/ns3/named.conf.j2 rename to bin/tests/system/cipher_suites/ns3/named.conf.j2 diff --git a/bin/tests/system/cipher-suites/ns4/named.conf.j2 b/bin/tests/system/cipher_suites/ns4/named.conf.j2 similarity index 100% rename from bin/tests/system/cipher-suites/ns4/named.conf.j2 rename to bin/tests/system/cipher_suites/ns4/named.conf.j2 diff --git a/bin/tests/system/cipher-suites/ns5/named.conf.j2 b/bin/tests/system/cipher_suites/ns5/named.conf.j2 similarity index 100% rename from bin/tests/system/cipher-suites/ns5/named.conf.j2 rename to bin/tests/system/cipher_suites/ns5/named.conf.j2 diff --git a/bin/tests/system/cipher-suites/prereq.sh b/bin/tests/system/cipher_suites/prereq.sh similarity index 100% rename from bin/tests/system/cipher-suites/prereq.sh rename to bin/tests/system/cipher_suites/prereq.sh diff --git a/bin/tests/system/cipher-suites/self-signed-cert.pem b/bin/tests/system/cipher_suites/self-signed-cert.pem similarity index 100% rename from bin/tests/system/cipher-suites/self-signed-cert.pem rename to bin/tests/system/cipher_suites/self-signed-cert.pem diff --git a/bin/tests/system/cipher-suites/self-signed-key.pem b/bin/tests/system/cipher_suites/self-signed-key.pem similarity index 100% rename from bin/tests/system/cipher-suites/self-signed-key.pem rename to bin/tests/system/cipher_suites/self-signed-key.pem diff --git a/bin/tests/system/cipher-suites/setup.sh b/bin/tests/system/cipher_suites/setup.sh similarity index 100% rename from bin/tests/system/cipher-suites/setup.sh rename to bin/tests/system/cipher_suites/setup.sh diff --git a/bin/tests/system/cipher-suites/tests_cipher_suites.py b/bin/tests/system/cipher_suites/tests_cipher_suites.py similarity index 100% rename from bin/tests/system/cipher-suites/tests_cipher_suites.py rename to bin/tests/system/cipher_suites/tests_cipher_suites.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/dnssec-unsupported-ds/ns1/named.conf.j2 b/bin/tests/system/dnssec_unsupported_ds/ns1/named.conf.j2 similarity index 100% rename from bin/tests/system/dnssec-unsupported-ds/ns1/named.conf.j2 rename to bin/tests/system/dnssec_unsupported_ds/ns1/named.conf.j2 diff --git a/bin/tests/system/dnssec-unsupported-ds/ns1/sign.sh b/bin/tests/system/dnssec_unsupported_ds/ns1/sign.sh similarity index 100% rename from bin/tests/system/dnssec-unsupported-ds/ns1/sign.sh rename to bin/tests/system/dnssec_unsupported_ds/ns1/sign.sh diff --git a/bin/tests/system/dnssec-unsupported-ds/ns1/zones/root.db.in b/bin/tests/system/dnssec_unsupported_ds/ns1/zones/root.db.in similarity index 100% rename from bin/tests/system/dnssec-unsupported-ds/ns1/zones/root.db.in rename to bin/tests/system/dnssec_unsupported_ds/ns1/zones/root.db.in diff --git a/bin/tests/system/dnssec-unsupported-ds/ns2/named.conf.j2 b/bin/tests/system/dnssec_unsupported_ds/ns2/named.conf.j2 similarity index 100% rename from bin/tests/system/dnssec-unsupported-ds/ns2/named.conf.j2 rename to bin/tests/system/dnssec_unsupported_ds/ns2/named.conf.j2 diff --git a/bin/tests/system/dnssec-unsupported-ds/ns2/sign.sh b/bin/tests/system/dnssec_unsupported_ds/ns2/sign.sh similarity index 100% rename from bin/tests/system/dnssec-unsupported-ds/ns2/sign.sh rename to bin/tests/system/dnssec_unsupported_ds/ns2/sign.sh diff --git a/bin/tests/system/dnssec-unsupported-ds/ns2/zones/example.db.in b/bin/tests/system/dnssec_unsupported_ds/ns2/zones/example.db.in similarity index 100% rename from bin/tests/system/dnssec-unsupported-ds/ns2/zones/example.db.in rename to bin/tests/system/dnssec_unsupported_ds/ns2/zones/example.db.in diff --git a/bin/tests/system/dnssec-unsupported-ds/ns3/named.conf.j2 b/bin/tests/system/dnssec_unsupported_ds/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/dnssec-unsupported-ds/ns3/named.conf.j2 rename to bin/tests/system/dnssec_unsupported_ds/ns3/named.conf.j2 diff --git a/bin/tests/system/dnssec-unsupported-ds/ns3/sign.sh b/bin/tests/system/dnssec_unsupported_ds/ns3/sign.sh similarity index 100% rename from bin/tests/system/dnssec-unsupported-ds/ns3/sign.sh rename to bin/tests/system/dnssec_unsupported_ds/ns3/sign.sh diff --git a/bin/tests/system/dnssec-unsupported-ds/ns3/zones/child.example.db.in b/bin/tests/system/dnssec_unsupported_ds/ns3/zones/child.example.db.in similarity index 100% rename from bin/tests/system/dnssec-unsupported-ds/ns3/zones/child.example.db.in rename to bin/tests/system/dnssec_unsupported_ds/ns3/zones/child.example.db.in diff --git a/bin/tests/system/dnssec-unsupported-ds/ns4/named.conf.j2 b/bin/tests/system/dnssec_unsupported_ds/ns4/named.conf.j2 similarity index 100% rename from bin/tests/system/dnssec-unsupported-ds/ns4/named.conf.j2 rename to bin/tests/system/dnssec_unsupported_ds/ns4/named.conf.j2 diff --git a/bin/tests/system/dnssec-unsupported-ds/setup.sh b/bin/tests/system/dnssec_unsupported_ds/setup.sh similarity index 100% rename from bin/tests/system/dnssec-unsupported-ds/setup.sh rename to bin/tests/system/dnssec_unsupported_ds/setup.sh diff --git a/bin/tests/system/dnssec-unsupported-ds/tests_mixed_ds.py b/bin/tests/system/dnssec_unsupported_ds/tests_mixed_ds.py similarity index 100% rename from bin/tests/system/dnssec-unsupported-ds/tests_mixed_ds.py rename to bin/tests/system/dnssec_unsupported_ds/tests_mixed_ds.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.j2 b/bin/tests/system/include_multiplecfg/ns2/named.conf.j2 similarity index 100% rename from bin/tests/system/include-multiplecfg/ns2/named.conf.j2 rename to bin/tests/system/include_multiplecfg/ns2/named.conf.j2 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/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/ixfr-nonminimal/ans2/ans.py b/bin/tests/system/ixfr_nonminimal/ans2/ans.py similarity index 100% rename from bin/tests/system/ixfr-nonminimal/ans2/ans.py rename to bin/tests/system/ixfr_nonminimal/ans2/ans.py diff --git a/bin/tests/system/ixfr-nonminimal/ans4/ans.py b/bin/tests/system/ixfr_nonminimal/ans4/ans.py similarity index 100% rename from bin/tests/system/ixfr-nonminimal/ans4/ans.py rename to bin/tests/system/ixfr_nonminimal/ans4/ans.py diff --git a/bin/tests/system/ixfr-nonminimal/ns1/named.conf.j2 b/bin/tests/system/ixfr_nonminimal/ns1/named.conf.j2 similarity index 100% rename from bin/tests/system/ixfr-nonminimal/ns1/named.conf.j2 rename to bin/tests/system/ixfr_nonminimal/ns1/named.conf.j2 diff --git a/bin/tests/system/ixfr-nonminimal/ns3/named.conf.j2 b/bin/tests/system/ixfr_nonminimal/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/ixfr-nonminimal/ns3/named.conf.j2 rename to bin/tests/system/ixfr_nonminimal/ns3/named.conf.j2 diff --git a/bin/tests/system/ixfr-nonminimal/prereq.sh b/bin/tests/system/ixfr_nonminimal/prereq.sh similarity index 100% rename from bin/tests/system/ixfr-nonminimal/prereq.sh rename to bin/tests/system/ixfr_nonminimal/prereq.sh diff --git a/bin/tests/system/ixfr-nonminimal/setup.sh b/bin/tests/system/ixfr_nonminimal/setup.sh similarity index 100% rename from bin/tests/system/ixfr-nonminimal/setup.sh rename to bin/tests/system/ixfr_nonminimal/setup.sh diff --git a/bin/tests/system/ixfr-nonminimal/tests.sh b/bin/tests/system/ixfr_nonminimal/tests.sh similarity index 100% rename from bin/tests/system/ixfr-nonminimal/tests.sh rename to bin/tests/system/ixfr_nonminimal/tests.sh diff --git a/bin/tests/system/ixfr-nonminimal/tests_sh_ixfr_nonminimal.py b/bin/tests/system/ixfr_nonminimal/tests_sh_ixfr_nonminimal.py similarity index 100% rename from bin/tests/system/ixfr-nonminimal/tests_sh_ixfr_nonminimal.py rename to bin/tests/system/ixfr_nonminimal/tests_sh_ixfr_nonminimal.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 f339813ced..f510f9ec08 100755 --- a/bin/tests/system/nsec3-answer/tests_nsec3.py +++ b/bin/tests/system/nsec3_answer/tests_nsec3.py @@ -44,7 +44,7 @@ AUTH = "10.53.0.1" RESOLVER = "10.53.0.2" TIMEOUT = 5 ZONE = isctest.name.ZoneAnalyzer.read_path( - Path(os.environ["srcdir"]) / "nsec3-answer/ns1/root.db.in", origin=SUFFIX + Path(os.environ["srcdir"]) / "nsec3_answer/ns1/root.db.in", origin=SUFFIX ) diff --git a/bin/tests/system/query-source/ns1/named.conf.j2 b/bin/tests/system/query_source/ns1/named.conf.j2 similarity index 100% rename from bin/tests/system/query-source/ns1/named.conf.j2 rename to bin/tests/system/query_source/ns1/named.conf.j2 diff --git a/bin/tests/system/query-source/ns1/root.db b/bin/tests/system/query_source/ns1/root.db similarity index 100% rename from bin/tests/system/query-source/ns1/root.db rename to bin/tests/system/query_source/ns1/root.db diff --git a/bin/tests/system/query-source/ns2/named.conf.j2 b/bin/tests/system/query_source/ns2/named.conf.j2 similarity index 100% rename from bin/tests/system/query-source/ns2/named.conf.j2 rename to bin/tests/system/query_source/ns2/named.conf.j2 diff --git a/bin/tests/system/query-source/ns2/root.hint b/bin/tests/system/query_source/ns2/root.hint similarity index 100% rename from bin/tests/system/query-source/ns2/root.hint rename to bin/tests/system/query_source/ns2/root.hint diff --git a/bin/tests/system/query-source/ns3/named.conf.j2 b/bin/tests/system/query_source/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/query-source/ns3/named.conf.j2 rename to bin/tests/system/query_source/ns3/named.conf.j2 diff --git a/bin/tests/system/query-source/ns3/root.hint b/bin/tests/system/query_source/ns3/root.hint similarity index 100% rename from bin/tests/system/query-source/ns3/root.hint rename to bin/tests/system/query_source/ns3/root.hint diff --git a/bin/tests/system/query-source/ns4/named.conf.j2 b/bin/tests/system/query_source/ns4/named.conf.j2 similarity index 100% rename from bin/tests/system/query-source/ns4/named.conf.j2 rename to bin/tests/system/query_source/ns4/named.conf.j2 diff --git a/bin/tests/system/query-source/ns4/root.hint b/bin/tests/system/query_source/ns4/root.hint similarity index 100% rename from bin/tests/system/query-source/ns4/root.hint rename to bin/tests/system/query_source/ns4/root.hint diff --git a/bin/tests/system/query-source/ns5/named.conf.j2 b/bin/tests/system/query_source/ns5/named.conf.j2 similarity index 100% rename from bin/tests/system/query-source/ns5/named.conf.j2 rename to bin/tests/system/query_source/ns5/named.conf.j2 diff --git a/bin/tests/system/query-source/ns5/root.hint b/bin/tests/system/query_source/ns5/root.hint similarity index 100% rename from bin/tests/system/query-source/ns5/root.hint rename to bin/tests/system/query_source/ns5/root.hint diff --git a/bin/tests/system/query-source/tests_querysource_none.py b/bin/tests/system/query_source/tests_querysource_none.py similarity index 100% rename from bin/tests/system/query-source/tests_querysource_none.py rename to bin/tests/system/query_source/tests_querysource_none.py diff --git a/bin/tests/system/rollover-ksk-3crowd/ns3/kasp.conf b/bin/tests/system/rollover-ksk-3crowd/ns3/kasp.conf deleted file mode 120000 index ca6c7139f3..0000000000 --- a/bin/tests/system/rollover-ksk-3crowd/ns3/kasp.conf +++ /dev/null @@ -1 +0,0 @@ -../../rollover-ksk-doubleksk/ns3/kasp.conf \ No newline at end of file diff --git a/bin/tests/system/rollover-straight2none/ns3/kasp.conf b/bin/tests/system/rollover-straight2none/ns3/kasp.conf deleted file mode 120000 index 647bd04b4d..0000000000 --- a/bin/tests/system/rollover-straight2none/ns3/kasp.conf +++ /dev/null @@ -1 +0,0 @@ -../../rollover-going-insecure/ns3/kasp.conf \ No newline at end of file diff --git a/bin/tests/system/rollover-algo-csk/ns1 b/bin/tests/system/rollover_algo_csk/ns1 similarity index 100% rename from bin/tests/system/rollover-algo-csk/ns1 rename to bin/tests/system/rollover_algo_csk/ns1 diff --git a/bin/tests/system/rollover-algo-csk/ns2 b/bin/tests/system/rollover_algo_csk/ns2 similarity index 100% rename from bin/tests/system/rollover-algo-csk/ns2 rename to bin/tests/system/rollover_algo_csk/ns2 diff --git a/bin/tests/system/rollover-algo-csk/ns3/csk1.conf b/bin/tests/system/rollover_algo_csk/ns3/csk1.conf similarity index 100% rename from bin/tests/system/rollover-algo-csk/ns3/csk1.conf rename to bin/tests/system/rollover_algo_csk/ns3/csk1.conf diff --git a/bin/tests/system/rollover-algo-csk/ns3/csk2.conf b/bin/tests/system/rollover_algo_csk/ns3/csk2.conf similarity index 100% rename from bin/tests/system/rollover-algo-csk/ns3/csk2.conf rename to bin/tests/system/rollover_algo_csk/ns3/csk2.conf diff --git a/bin/tests/system/rollover-algo-csk/ns3/named.common.conf.j2 b/bin/tests/system/rollover_algo_csk/ns3/named.common.conf.j2 similarity index 100% rename from bin/tests/system/rollover-algo-csk/ns3/named.common.conf.j2 rename to bin/tests/system/rollover_algo_csk/ns3/named.common.conf.j2 diff --git a/bin/tests/system/rollover-algo-csk/ns3/named.conf.j2 b/bin/tests/system/rollover_algo_csk/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/rollover-algo-csk/ns3/named.conf.j2 rename to bin/tests/system/rollover_algo_csk/ns3/named.conf.j2 diff --git a/bin/tests/system/rollover-algo-csk/ns3/template.db.j2.manual b/bin/tests/system/rollover_algo_csk/ns3/template.db.j2.manual similarity index 100% rename from bin/tests/system/rollover-algo-csk/ns3/template.db.j2.manual rename to bin/tests/system/rollover_algo_csk/ns3/template.db.j2.manual diff --git a/bin/tests/system/rollover-algo-csk/ns3/trusted.conf.j2 b/bin/tests/system/rollover_algo_csk/ns3/trusted.conf.j2 similarity index 100% rename from bin/tests/system/rollover-algo-csk/ns3/trusted.conf.j2 rename to bin/tests/system/rollover_algo_csk/ns3/trusted.conf.j2 diff --git a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py b/bin/tests/system/rollover_algo_csk/tests_rollover_algo_csk_initial.py similarity index 100% rename from bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py rename to bin/tests/system/rollover_algo_csk/tests_rollover_algo_csk_initial.py diff --git a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py b/bin/tests/system/rollover_algo_csk/tests_rollover_algo_csk_reconfig.py similarity index 100% rename from bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py rename to bin/tests/system/rollover_algo_csk/tests_rollover_algo_csk_reconfig.py diff --git a/bin/tests/system/rollover-algo-ksk-zsk/ns1 b/bin/tests/system/rollover_algo_ksk_zsk/ns1 similarity index 100% rename from bin/tests/system/rollover-algo-ksk-zsk/ns1 rename to bin/tests/system/rollover_algo_ksk_zsk/ns1 diff --git a/bin/tests/system/rollover-algo-ksk-zsk/ns2 b/bin/tests/system/rollover_algo_ksk_zsk/ns2 similarity index 100% rename from bin/tests/system/rollover-algo-ksk-zsk/ns2 rename to bin/tests/system/rollover_algo_ksk_zsk/ns2 diff --git a/bin/tests/system/rollover-algo-ksk-zsk/ns3/kasp.conf b/bin/tests/system/rollover_algo_ksk_zsk/ns3/kasp.conf similarity index 100% rename from bin/tests/system/rollover-algo-ksk-zsk/ns3/kasp.conf rename to bin/tests/system/rollover_algo_ksk_zsk/ns3/kasp.conf diff --git a/bin/tests/system/rollover-algo-ksk-zsk/ns3/named.common.conf.j2 b/bin/tests/system/rollover_algo_ksk_zsk/ns3/named.common.conf.j2 similarity index 100% rename from bin/tests/system/rollover-algo-ksk-zsk/ns3/named.common.conf.j2 rename to bin/tests/system/rollover_algo_ksk_zsk/ns3/named.common.conf.j2 diff --git a/bin/tests/system/rollover-algo-ksk-zsk/ns3/named.conf.j2 b/bin/tests/system/rollover_algo_ksk_zsk/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/rollover-algo-ksk-zsk/ns3/named.conf.j2 rename to bin/tests/system/rollover_algo_ksk_zsk/ns3/named.conf.j2 diff --git a/bin/tests/system/rollover-algo-ksk-zsk/ns3/template.db.j2.manual b/bin/tests/system/rollover_algo_ksk_zsk/ns3/template.db.j2.manual similarity index 100% rename from bin/tests/system/rollover-algo-ksk-zsk/ns3/template.db.j2.manual rename to bin/tests/system/rollover_algo_ksk_zsk/ns3/template.db.j2.manual diff --git a/bin/tests/system/rollover-algo-ksk-zsk/ns3/trusted.conf.j2 b/bin/tests/system/rollover_algo_ksk_zsk/ns3/trusted.conf.j2 similarity index 100% rename from bin/tests/system/rollover-algo-ksk-zsk/ns3/trusted.conf.j2 rename to bin/tests/system/rollover_algo_ksk_zsk/ns3/trusted.conf.j2 diff --git a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py b/bin/tests/system/rollover_algo_ksk_zsk/tests_rollover_algo_ksk_zsk_initial.py similarity index 100% rename from bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py rename to bin/tests/system/rollover_algo_ksk_zsk/tests_rollover_algo_ksk_zsk_initial.py diff --git a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py b/bin/tests/system/rollover_algo_ksk_zsk/tests_rollover_algo_ksk_zsk_reconfig.py similarity index 100% rename from bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py rename to bin/tests/system/rollover_algo_ksk_zsk/tests_rollover_algo_ksk_zsk_reconfig.py diff --git a/bin/tests/system/rollover-csk-roll1/ns1 b/bin/tests/system/rollover_csk_roll1/ns1 similarity index 100% rename from bin/tests/system/rollover-csk-roll1/ns1 rename to bin/tests/system/rollover_csk_roll1/ns1 diff --git a/bin/tests/system/rollover-csk-roll1/ns2 b/bin/tests/system/rollover_csk_roll1/ns2 similarity index 100% rename from bin/tests/system/rollover-csk-roll1/ns2 rename to bin/tests/system/rollover_csk_roll1/ns2 diff --git a/bin/tests/system/rollover-csk-roll1/ns3/kasp.conf b/bin/tests/system/rollover_csk_roll1/ns3/kasp.conf similarity index 100% rename from bin/tests/system/rollover-csk-roll1/ns3/kasp.conf rename to bin/tests/system/rollover_csk_roll1/ns3/kasp.conf diff --git a/bin/tests/system/rollover-csk-roll1/ns3/named.common.conf.j2 b/bin/tests/system/rollover_csk_roll1/ns3/named.common.conf.j2 similarity index 100% rename from bin/tests/system/rollover-csk-roll1/ns3/named.common.conf.j2 rename to bin/tests/system/rollover_csk_roll1/ns3/named.common.conf.j2 diff --git a/bin/tests/system/rollover-csk-roll1/ns3/named.conf.j2 b/bin/tests/system/rollover_csk_roll1/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/rollover-csk-roll1/ns3/named.conf.j2 rename to bin/tests/system/rollover_csk_roll1/ns3/named.conf.j2 diff --git a/bin/tests/system/rollover-csk-roll1/ns3/template.db.j2.manual b/bin/tests/system/rollover_csk_roll1/ns3/template.db.j2.manual similarity index 100% rename from bin/tests/system/rollover-csk-roll1/ns3/template.db.j2.manual rename to bin/tests/system/rollover_csk_roll1/ns3/template.db.j2.manual diff --git a/bin/tests/system/rollover-csk-roll1/ns3/trusted.conf.j2 b/bin/tests/system/rollover_csk_roll1/ns3/trusted.conf.j2 similarity index 100% rename from bin/tests/system/rollover-csk-roll1/ns3/trusted.conf.j2 rename to bin/tests/system/rollover_csk_roll1/ns3/trusted.conf.j2 diff --git a/bin/tests/system/rollover-csk-roll1/tests_rollover_csk_roll1.py b/bin/tests/system/rollover_csk_roll1/tests_rollover_csk_roll1.py similarity index 100% rename from bin/tests/system/rollover-csk-roll1/tests_rollover_csk_roll1.py rename to bin/tests/system/rollover_csk_roll1/tests_rollover_csk_roll1.py diff --git a/bin/tests/system/rollover-csk-roll2/ns1 b/bin/tests/system/rollover_csk_roll2/ns1 similarity index 100% rename from bin/tests/system/rollover-csk-roll2/ns1 rename to bin/tests/system/rollover_csk_roll2/ns1 diff --git a/bin/tests/system/rollover-csk-roll2/ns2 b/bin/tests/system/rollover_csk_roll2/ns2 similarity index 100% rename from bin/tests/system/rollover-csk-roll2/ns2 rename to bin/tests/system/rollover_csk_roll2/ns2 diff --git a/bin/tests/system/rollover-csk-roll2/ns3/kasp.conf b/bin/tests/system/rollover_csk_roll2/ns3/kasp.conf similarity index 100% rename from bin/tests/system/rollover-csk-roll2/ns3/kasp.conf rename to bin/tests/system/rollover_csk_roll2/ns3/kasp.conf diff --git a/bin/tests/system/rollover-csk-roll2/ns3/named.common.conf.j2 b/bin/tests/system/rollover_csk_roll2/ns3/named.common.conf.j2 similarity index 100% rename from bin/tests/system/rollover-csk-roll2/ns3/named.common.conf.j2 rename to bin/tests/system/rollover_csk_roll2/ns3/named.common.conf.j2 diff --git a/bin/tests/system/rollover-csk-roll2/ns3/named.conf.j2 b/bin/tests/system/rollover_csk_roll2/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/rollover-csk-roll2/ns3/named.conf.j2 rename to bin/tests/system/rollover_csk_roll2/ns3/named.conf.j2 diff --git a/bin/tests/system/rollover-csk-roll2/ns3/template.db.j2.manual b/bin/tests/system/rollover_csk_roll2/ns3/template.db.j2.manual similarity index 100% rename from bin/tests/system/rollover-csk-roll2/ns3/template.db.j2.manual rename to bin/tests/system/rollover_csk_roll2/ns3/template.db.j2.manual diff --git a/bin/tests/system/rollover-csk-roll2/ns3/trusted.conf.j2 b/bin/tests/system/rollover_csk_roll2/ns3/trusted.conf.j2 similarity index 100% rename from bin/tests/system/rollover-csk-roll2/ns3/trusted.conf.j2 rename to bin/tests/system/rollover_csk_roll2/ns3/trusted.conf.j2 diff --git a/bin/tests/system/rollover-csk-roll2/tests_rollover_csk_roll2.py b/bin/tests/system/rollover_csk_roll2/tests_rollover_csk_roll2.py similarity index 100% rename from bin/tests/system/rollover-csk-roll2/tests_rollover_csk_roll2.py rename to bin/tests/system/rollover_csk_roll2/tests_rollover_csk_roll2.py diff --git a/bin/tests/system/rollover-dynamic2inline/ns3/dynamic2inline.kasp.db b/bin/tests/system/rollover_dynamic2inline/ns3/dynamic2inline.kasp.db similarity index 100% rename from bin/tests/system/rollover-dynamic2inline/ns3/dynamic2inline.kasp.db rename to bin/tests/system/rollover_dynamic2inline/ns3/dynamic2inline.kasp.db diff --git a/bin/tests/system/rollover-dynamic2inline/ns3/named.common.conf.j2 b/bin/tests/system/rollover_dynamic2inline/ns3/named.common.conf.j2 similarity index 100% rename from bin/tests/system/rollover-dynamic2inline/ns3/named.common.conf.j2 rename to bin/tests/system/rollover_dynamic2inline/ns3/named.common.conf.j2 diff --git a/bin/tests/system/rollover-dynamic2inline/ns3/named.conf.j2 b/bin/tests/system/rollover_dynamic2inline/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/rollover-dynamic2inline/ns3/named.conf.j2 rename to bin/tests/system/rollover_dynamic2inline/ns3/named.conf.j2 diff --git a/bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py b/bin/tests/system/rollover_dynamic2inline/tests_rollover_dynamic2inline.py similarity index 100% rename from bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py rename to bin/tests/system/rollover_dynamic2inline/tests_rollover_dynamic2inline.py diff --git a/bin/tests/system/rollover-enable-dnssec/ns1 b/bin/tests/system/rollover_enable_dnssec/ns1 similarity index 100% rename from bin/tests/system/rollover-enable-dnssec/ns1 rename to bin/tests/system/rollover_enable_dnssec/ns1 diff --git a/bin/tests/system/rollover-enable-dnssec/ns2 b/bin/tests/system/rollover_enable_dnssec/ns2 similarity index 100% rename from bin/tests/system/rollover-enable-dnssec/ns2 rename to bin/tests/system/rollover_enable_dnssec/ns2 diff --git a/bin/tests/system/rollover-enable-dnssec/ns3/kasp.conf b/bin/tests/system/rollover_enable_dnssec/ns3/kasp.conf similarity index 100% rename from bin/tests/system/rollover-enable-dnssec/ns3/kasp.conf rename to bin/tests/system/rollover_enable_dnssec/ns3/kasp.conf diff --git a/bin/tests/system/rollover-enable-dnssec/ns3/named.common.conf.j2 b/bin/tests/system/rollover_enable_dnssec/ns3/named.common.conf.j2 similarity index 100% rename from bin/tests/system/rollover-enable-dnssec/ns3/named.common.conf.j2 rename to bin/tests/system/rollover_enable_dnssec/ns3/named.common.conf.j2 diff --git a/bin/tests/system/rollover-enable-dnssec/ns3/named.conf.j2 b/bin/tests/system/rollover_enable_dnssec/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/rollover-enable-dnssec/ns3/named.conf.j2 rename to bin/tests/system/rollover_enable_dnssec/ns3/named.conf.j2 diff --git a/bin/tests/system/rollover-enable-dnssec/ns3/template.db.j2.manual b/bin/tests/system/rollover_enable_dnssec/ns3/template.db.j2.manual similarity index 100% rename from bin/tests/system/rollover-enable-dnssec/ns3/template.db.j2.manual rename to bin/tests/system/rollover_enable_dnssec/ns3/template.db.j2.manual diff --git a/bin/tests/system/rollover-enable-dnssec/ns3/trusted.conf.j2 b/bin/tests/system/rollover_enable_dnssec/ns3/trusted.conf.j2 similarity index 100% rename from bin/tests/system/rollover-enable-dnssec/ns3/trusted.conf.j2 rename to bin/tests/system/rollover_enable_dnssec/ns3/trusted.conf.j2 diff --git a/bin/tests/system/rollover-enable-dnssec/tests_rollover_enable_dnssec.py b/bin/tests/system/rollover_enable_dnssec/tests_rollover_enable_dnssec.py similarity index 100% rename from bin/tests/system/rollover-enable-dnssec/tests_rollover_enable_dnssec.py rename to bin/tests/system/rollover_enable_dnssec/tests_rollover_enable_dnssec.py diff --git a/bin/tests/system/rollover-going-insecure/ns1 b/bin/tests/system/rollover_going_insecure/ns1 similarity index 100% rename from bin/tests/system/rollover-going-insecure/ns1 rename to bin/tests/system/rollover_going_insecure/ns1 diff --git a/bin/tests/system/rollover-going-insecure/ns2 b/bin/tests/system/rollover_going_insecure/ns2 similarity index 100% rename from bin/tests/system/rollover-going-insecure/ns2 rename to bin/tests/system/rollover_going_insecure/ns2 diff --git a/bin/tests/system/rollover-going-insecure/ns3/kasp.conf b/bin/tests/system/rollover_going_insecure/ns3/kasp.conf similarity index 100% rename from bin/tests/system/rollover-going-insecure/ns3/kasp.conf rename to bin/tests/system/rollover_going_insecure/ns3/kasp.conf diff --git a/bin/tests/system/rollover-going-insecure/ns3/named.common.conf.j2 b/bin/tests/system/rollover_going_insecure/ns3/named.common.conf.j2 similarity index 100% rename from bin/tests/system/rollover-going-insecure/ns3/named.common.conf.j2 rename to bin/tests/system/rollover_going_insecure/ns3/named.common.conf.j2 diff --git a/bin/tests/system/rollover-going-insecure/ns3/named.conf.j2 b/bin/tests/system/rollover_going_insecure/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/rollover-going-insecure/ns3/named.conf.j2 rename to bin/tests/system/rollover_going_insecure/ns3/named.conf.j2 diff --git a/bin/tests/system/rollover-going-insecure/ns3/template.db.j2.manual b/bin/tests/system/rollover_going_insecure/ns3/template.db.j2.manual similarity index 100% rename from bin/tests/system/rollover-going-insecure/ns3/template.db.j2.manual rename to bin/tests/system/rollover_going_insecure/ns3/template.db.j2.manual diff --git a/bin/tests/system/rollover-going-insecure/ns3/trusted.conf.j2 b/bin/tests/system/rollover_going_insecure/ns3/trusted.conf.j2 similarity index 100% rename from bin/tests/system/rollover-going-insecure/ns3/trusted.conf.j2 rename to bin/tests/system/rollover_going_insecure/ns3/trusted.conf.j2 diff --git a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py b/bin/tests/system/rollover_going_insecure/tests_rollover_going_insecure_initial.py similarity index 100% rename from bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py rename to bin/tests/system/rollover_going_insecure/tests_rollover_going_insecure_initial.py diff --git a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py b/bin/tests/system/rollover_going_insecure/tests_rollover_going_insecure_reconfig.py similarity index 100% rename from bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py rename to bin/tests/system/rollover_going_insecure/tests_rollover_going_insecure_reconfig.py diff --git a/bin/tests/system/rollover-ksk-3crowd/ns1 b/bin/tests/system/rollover_ksk_3crowd/ns1 similarity index 100% rename from bin/tests/system/rollover-ksk-3crowd/ns1 rename to bin/tests/system/rollover_ksk_3crowd/ns1 diff --git a/bin/tests/system/rollover-ksk-3crowd/ns2 b/bin/tests/system/rollover_ksk_3crowd/ns2 similarity index 100% rename from bin/tests/system/rollover-ksk-3crowd/ns2 rename to bin/tests/system/rollover_ksk_3crowd/ns2 diff --git a/bin/tests/system/rollover_ksk_3crowd/ns3/kasp.conf b/bin/tests/system/rollover_ksk_3crowd/ns3/kasp.conf new file mode 120000 index 0000000000..3cdfe3db68 --- /dev/null +++ b/bin/tests/system/rollover_ksk_3crowd/ns3/kasp.conf @@ -0,0 +1 @@ +../../rollover_ksk_doubleksk/ns3/kasp.conf \ No newline at end of file diff --git a/bin/tests/system/rollover-ksk-3crowd/ns3/named.common.conf.j2 b/bin/tests/system/rollover_ksk_3crowd/ns3/named.common.conf.j2 similarity index 100% rename from bin/tests/system/rollover-ksk-3crowd/ns3/named.common.conf.j2 rename to bin/tests/system/rollover_ksk_3crowd/ns3/named.common.conf.j2 diff --git a/bin/tests/system/rollover-ksk-3crowd/ns3/named.conf.j2 b/bin/tests/system/rollover_ksk_3crowd/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/rollover-ksk-3crowd/ns3/named.conf.j2 rename to bin/tests/system/rollover_ksk_3crowd/ns3/named.conf.j2 diff --git a/bin/tests/system/rollover-ksk-3crowd/ns3/template.db.j2.manual b/bin/tests/system/rollover_ksk_3crowd/ns3/template.db.j2.manual similarity index 100% rename from bin/tests/system/rollover-ksk-3crowd/ns3/template.db.j2.manual rename to bin/tests/system/rollover_ksk_3crowd/ns3/template.db.j2.manual diff --git a/bin/tests/system/rollover-ksk-3crowd/ns3/trusted.conf.j2 b/bin/tests/system/rollover_ksk_3crowd/ns3/trusted.conf.j2 similarity index 100% rename from bin/tests/system/rollover-ksk-3crowd/ns3/trusted.conf.j2 rename to bin/tests/system/rollover_ksk_3crowd/ns3/trusted.conf.j2 diff --git a/bin/tests/system/rollover-ksk-3crowd/tests_rollover_three_is_a_crowd.py b/bin/tests/system/rollover_ksk_3crowd/tests_rollover_three_is_a_crowd.py similarity index 100% rename from bin/tests/system/rollover-ksk-3crowd/tests_rollover_three_is_a_crowd.py rename to bin/tests/system/rollover_ksk_3crowd/tests_rollover_three_is_a_crowd.py diff --git a/bin/tests/system/rollover-ksk-doubleksk/ns1 b/bin/tests/system/rollover_ksk_doubleksk/ns1 similarity index 100% rename from bin/tests/system/rollover-ksk-doubleksk/ns1 rename to bin/tests/system/rollover_ksk_doubleksk/ns1 diff --git a/bin/tests/system/rollover-ksk-doubleksk/ns2 b/bin/tests/system/rollover_ksk_doubleksk/ns2 similarity index 100% rename from bin/tests/system/rollover-ksk-doubleksk/ns2 rename to bin/tests/system/rollover_ksk_doubleksk/ns2 diff --git a/bin/tests/system/rollover-ksk-doubleksk/ns3/kasp.conf b/bin/tests/system/rollover_ksk_doubleksk/ns3/kasp.conf similarity index 100% rename from bin/tests/system/rollover-ksk-doubleksk/ns3/kasp.conf rename to bin/tests/system/rollover_ksk_doubleksk/ns3/kasp.conf diff --git a/bin/tests/system/rollover-ksk-doubleksk/ns3/named.common.conf.j2 b/bin/tests/system/rollover_ksk_doubleksk/ns3/named.common.conf.j2 similarity index 100% rename from bin/tests/system/rollover-ksk-doubleksk/ns3/named.common.conf.j2 rename to bin/tests/system/rollover_ksk_doubleksk/ns3/named.common.conf.j2 diff --git a/bin/tests/system/rollover-ksk-doubleksk/ns3/named.conf.j2 b/bin/tests/system/rollover_ksk_doubleksk/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/rollover-ksk-doubleksk/ns3/named.conf.j2 rename to bin/tests/system/rollover_ksk_doubleksk/ns3/named.conf.j2 diff --git a/bin/tests/system/rollover-ksk-doubleksk/ns3/template.db.j2.manual b/bin/tests/system/rollover_ksk_doubleksk/ns3/template.db.j2.manual similarity index 100% rename from bin/tests/system/rollover-ksk-doubleksk/ns3/template.db.j2.manual rename to bin/tests/system/rollover_ksk_doubleksk/ns3/template.db.j2.manual diff --git a/bin/tests/system/rollover-ksk-doubleksk/ns3/trusted.conf.j2 b/bin/tests/system/rollover_ksk_doubleksk/ns3/trusted.conf.j2 similarity index 100% rename from bin/tests/system/rollover-ksk-doubleksk/ns3/trusted.conf.j2 rename to bin/tests/system/rollover_ksk_doubleksk/ns3/trusted.conf.j2 diff --git a/bin/tests/system/rollover-ksk-doubleksk/tests_rollover_ksk_doubleksk.py b/bin/tests/system/rollover_ksk_doubleksk/tests_rollover_ksk_doubleksk.py similarity index 100% rename from bin/tests/system/rollover-ksk-doubleksk/tests_rollover_ksk_doubleksk.py rename to bin/tests/system/rollover_ksk_doubleksk/tests_rollover_ksk_doubleksk.py diff --git a/bin/tests/system/rollover-lifetime/ns3/kasp.conf.j2 b/bin/tests/system/rollover_lifetime/ns3/kasp.conf.j2 similarity index 100% rename from bin/tests/system/rollover-lifetime/ns3/kasp.conf.j2 rename to bin/tests/system/rollover_lifetime/ns3/kasp.conf.j2 diff --git a/bin/tests/system/rollover-lifetime/ns3/limit-lifetime.db b/bin/tests/system/rollover_lifetime/ns3/limit-lifetime.db similarity index 100% rename from bin/tests/system/rollover-lifetime/ns3/limit-lifetime.db rename to bin/tests/system/rollover_lifetime/ns3/limit-lifetime.db diff --git a/bin/tests/system/rollover-lifetime/ns3/longer-lifetime.db b/bin/tests/system/rollover_lifetime/ns3/longer-lifetime.db similarity index 100% rename from bin/tests/system/rollover-lifetime/ns3/longer-lifetime.db rename to bin/tests/system/rollover_lifetime/ns3/longer-lifetime.db diff --git a/bin/tests/system/rollover-lifetime/ns3/named.common.conf.j2 b/bin/tests/system/rollover_lifetime/ns3/named.common.conf.j2 similarity index 100% rename from bin/tests/system/rollover-lifetime/ns3/named.common.conf.j2 rename to bin/tests/system/rollover_lifetime/ns3/named.common.conf.j2 diff --git a/bin/tests/system/rollover-lifetime/ns3/named.conf.j2 b/bin/tests/system/rollover_lifetime/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/rollover-lifetime/ns3/named.conf.j2 rename to bin/tests/system/rollover_lifetime/ns3/named.conf.j2 diff --git a/bin/tests/system/rollover-lifetime/ns3/shorter-lifetime.db b/bin/tests/system/rollover_lifetime/ns3/shorter-lifetime.db similarity index 100% rename from bin/tests/system/rollover-lifetime/ns3/shorter-lifetime.db rename to bin/tests/system/rollover_lifetime/ns3/shorter-lifetime.db diff --git a/bin/tests/system/rollover-lifetime/ns3/template.db.in b/bin/tests/system/rollover_lifetime/ns3/template.db.in similarity index 100% rename from bin/tests/system/rollover-lifetime/ns3/template.db.in rename to bin/tests/system/rollover_lifetime/ns3/template.db.in diff --git a/bin/tests/system/rollover-lifetime/ns3/unlimit-lifetime.db b/bin/tests/system/rollover_lifetime/ns3/unlimit-lifetime.db similarity index 100% rename from bin/tests/system/rollover-lifetime/ns3/unlimit-lifetime.db rename to bin/tests/system/rollover_lifetime/ns3/unlimit-lifetime.db diff --git a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py b/bin/tests/system/rollover_lifetime/tests_rollover_lifetime_initial.py similarity index 100% rename from bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py rename to bin/tests/system/rollover_lifetime/tests_rollover_lifetime_initial.py diff --git a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py b/bin/tests/system/rollover_lifetime/tests_rollover_lifetime_reconfig.py similarity index 100% rename from bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py rename to bin/tests/system/rollover_lifetime/tests_rollover_lifetime_reconfig.py diff --git a/bin/tests/system/rollover-multisigner/ns3/kasp.conf.j2 b/bin/tests/system/rollover_multisigner/ns3/kasp.conf.j2 similarity index 100% rename from bin/tests/system/rollover-multisigner/ns3/kasp.conf.j2 rename to bin/tests/system/rollover_multisigner/ns3/kasp.conf.j2 diff --git a/bin/tests/system/rollover-multisigner/ns3/named.common.conf.j2 b/bin/tests/system/rollover_multisigner/ns3/named.common.conf.j2 similarity index 100% rename from bin/tests/system/rollover-multisigner/ns3/named.common.conf.j2 rename to bin/tests/system/rollover_multisigner/ns3/named.common.conf.j2 diff --git a/bin/tests/system/rollover-multisigner/ns3/named.conf.j2 b/bin/tests/system/rollover_multisigner/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/rollover-multisigner/ns3/named.conf.j2 rename to bin/tests/system/rollover_multisigner/ns3/named.conf.j2 diff --git a/bin/tests/system/rollover-multisigner/ns3/template.db.in b/bin/tests/system/rollover_multisigner/ns3/template.db.in similarity index 100% rename from bin/tests/system/rollover-multisigner/ns3/template.db.in rename to bin/tests/system/rollover_multisigner/ns3/template.db.in diff --git a/bin/tests/system/rollover-multisigner/ns3/template.db.j2.manual b/bin/tests/system/rollover_multisigner/ns3/template.db.j2.manual similarity index 100% rename from bin/tests/system/rollover-multisigner/ns3/template.db.j2.manual rename to bin/tests/system/rollover_multisigner/ns3/template.db.j2.manual diff --git a/bin/tests/system/rollover-multisigner/tests_rollover_multisigner.py b/bin/tests/system/rollover_multisigner/tests_rollover_multisigner.py similarity index 100% rename from bin/tests/system/rollover-multisigner/tests_rollover_multisigner.py rename to bin/tests/system/rollover_multisigner/tests_rollover_multisigner.py diff --git a/bin/tests/system/rollover-straight2none/ns1 b/bin/tests/system/rollover_straight2none/ns1 similarity index 100% rename from bin/tests/system/rollover-straight2none/ns1 rename to bin/tests/system/rollover_straight2none/ns1 diff --git a/bin/tests/system/rollover-straight2none/ns2 b/bin/tests/system/rollover_straight2none/ns2 similarity index 100% rename from bin/tests/system/rollover-straight2none/ns2 rename to bin/tests/system/rollover_straight2none/ns2 diff --git a/bin/tests/system/rollover_straight2none/ns3/kasp.conf b/bin/tests/system/rollover_straight2none/ns3/kasp.conf new file mode 120000 index 0000000000..5b994bf897 --- /dev/null +++ b/bin/tests/system/rollover_straight2none/ns3/kasp.conf @@ -0,0 +1 @@ +../../rollover_going_insecure/ns3/kasp.conf \ No newline at end of file diff --git a/bin/tests/system/rollover-straight2none/ns3/named.common.conf.j2 b/bin/tests/system/rollover_straight2none/ns3/named.common.conf.j2 similarity index 100% rename from bin/tests/system/rollover-straight2none/ns3/named.common.conf.j2 rename to bin/tests/system/rollover_straight2none/ns3/named.common.conf.j2 diff --git a/bin/tests/system/rollover-straight2none/ns3/named.conf.j2 b/bin/tests/system/rollover_straight2none/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/rollover-straight2none/ns3/named.conf.j2 rename to bin/tests/system/rollover_straight2none/ns3/named.conf.j2 diff --git a/bin/tests/system/rollover-straight2none/ns3/template.db.j2.manual b/bin/tests/system/rollover_straight2none/ns3/template.db.j2.manual similarity index 100% rename from bin/tests/system/rollover-straight2none/ns3/template.db.j2.manual rename to bin/tests/system/rollover_straight2none/ns3/template.db.j2.manual diff --git a/bin/tests/system/rollover-straight2none/ns3/trusted.conf.j2 b/bin/tests/system/rollover_straight2none/ns3/trusted.conf.j2 similarity index 100% rename from bin/tests/system/rollover-straight2none/ns3/trusted.conf.j2 rename to bin/tests/system/rollover_straight2none/ns3/trusted.conf.j2 diff --git a/bin/tests/system/rollover-straight2none/tests_rollover_straight2none_initial.py b/bin/tests/system/rollover_straight2none/tests_rollover_straight2none_initial.py similarity index 100% rename from bin/tests/system/rollover-straight2none/tests_rollover_straight2none_initial.py rename to bin/tests/system/rollover_straight2none/tests_rollover_straight2none_initial.py diff --git a/bin/tests/system/rollover-straight2none/tests_rollover_straight2none_reconfig.py b/bin/tests/system/rollover_straight2none/tests_rollover_straight2none_reconfig.py similarity index 100% rename from bin/tests/system/rollover-straight2none/tests_rollover_straight2none_reconfig.py rename to bin/tests/system/rollover_straight2none/tests_rollover_straight2none_reconfig.py diff --git a/bin/tests/system/rollover-zsk-prepub/ns1 b/bin/tests/system/rollover_zsk_prepub/ns1 similarity index 100% rename from bin/tests/system/rollover-zsk-prepub/ns1 rename to bin/tests/system/rollover_zsk_prepub/ns1 diff --git a/bin/tests/system/rollover-zsk-prepub/ns2 b/bin/tests/system/rollover_zsk_prepub/ns2 similarity index 100% rename from bin/tests/system/rollover-zsk-prepub/ns2 rename to bin/tests/system/rollover_zsk_prepub/ns2 diff --git a/bin/tests/system/rollover-zsk-prepub/ns3/kasp.conf b/bin/tests/system/rollover_zsk_prepub/ns3/kasp.conf similarity index 100% rename from bin/tests/system/rollover-zsk-prepub/ns3/kasp.conf rename to bin/tests/system/rollover_zsk_prepub/ns3/kasp.conf diff --git a/bin/tests/system/rollover-zsk-prepub/ns3/named.common.conf.j2 b/bin/tests/system/rollover_zsk_prepub/ns3/named.common.conf.j2 similarity index 100% rename from bin/tests/system/rollover-zsk-prepub/ns3/named.common.conf.j2 rename to bin/tests/system/rollover_zsk_prepub/ns3/named.common.conf.j2 diff --git a/bin/tests/system/rollover-zsk-prepub/ns3/named.conf.j2 b/bin/tests/system/rollover_zsk_prepub/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/rollover-zsk-prepub/ns3/named.conf.j2 rename to bin/tests/system/rollover_zsk_prepub/ns3/named.conf.j2 diff --git a/bin/tests/system/rollover-zsk-prepub/ns3/template.db.j2.manual b/bin/tests/system/rollover_zsk_prepub/ns3/template.db.j2.manual similarity index 100% rename from bin/tests/system/rollover-zsk-prepub/ns3/template.db.j2.manual rename to bin/tests/system/rollover_zsk_prepub/ns3/template.db.j2.manual diff --git a/bin/tests/system/rollover-zsk-prepub/ns3/trusted.conf.j2 b/bin/tests/system/rollover_zsk_prepub/ns3/trusted.conf.j2 similarity index 100% rename from bin/tests/system/rollover-zsk-prepub/ns3/trusted.conf.j2 rename to bin/tests/system/rollover_zsk_prepub/ns3/trusted.conf.j2 diff --git a/bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py b/bin/tests/system/rollover_zsk_prepub/tests_rollover_zsk_prepublication.py similarity index 100% rename from bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py rename to bin/tests/system/rollover_zsk_prepub/tests_rollover_zsk_prepublication.py 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/named.conf.j2 b/bin/tests/system/serve_stale/ns1/named.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns1/named.conf.j2 rename to bin/tests/system/serve_stale/ns1/named.conf.j2 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/named2.conf.j2 b/bin/tests/system/serve_stale/ns1/named2.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns1/named2.conf.j2 rename to bin/tests/system/serve_stale/ns1/named2.conf.j2 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/named3.conf.j2 b/bin/tests/system/serve_stale/ns1/named3.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns1/named3.conf.j2 rename to bin/tests/system/serve_stale/ns1/named3.conf.j2 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/named4.conf.j2 b/bin/tests/system/serve_stale/ns1/named4.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns1/named4.conf.j2 rename to bin/tests/system/serve_stale/ns1/named4.conf.j2 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.j2 b/bin/tests/system/serve_stale/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns3/named.conf.j2 rename to bin/tests/system/serve_stale/ns3/named.conf.j2 diff --git a/bin/tests/system/serve-stale/ns3/named1.conf.j2 b/bin/tests/system/serve_stale/ns3/named1.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns3/named1.conf.j2 rename to bin/tests/system/serve_stale/ns3/named1.conf.j2 diff --git a/bin/tests/system/serve-stale/ns3/named2.conf.j2 b/bin/tests/system/serve_stale/ns3/named2.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns3/named2.conf.j2 rename to bin/tests/system/serve_stale/ns3/named2.conf.j2 diff --git a/bin/tests/system/serve-stale/ns3/named3.conf.j2 b/bin/tests/system/serve_stale/ns3/named3.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns3/named3.conf.j2 rename to bin/tests/system/serve_stale/ns3/named3.conf.j2 diff --git a/bin/tests/system/serve-stale/ns3/named4.conf.j2 b/bin/tests/system/serve_stale/ns3/named4.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns3/named4.conf.j2 rename to bin/tests/system/serve_stale/ns3/named4.conf.j2 diff --git a/bin/tests/system/serve-stale/ns3/named5.conf.j2 b/bin/tests/system/serve_stale/ns3/named5.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns3/named5.conf.j2 rename to bin/tests/system/serve_stale/ns3/named5.conf.j2 diff --git a/bin/tests/system/serve-stale/ns3/named6.conf.j2 b/bin/tests/system/serve_stale/ns3/named6.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns3/named6.conf.j2 rename to bin/tests/system/serve_stale/ns3/named6.conf.j2 diff --git a/bin/tests/system/serve-stale/ns3/named7.conf.j2 b/bin/tests/system/serve_stale/ns3/named7.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns3/named7.conf.j2 rename to bin/tests/system/serve_stale/ns3/named7.conf.j2 diff --git a/bin/tests/system/serve-stale/ns3/named8.conf.j2 b/bin/tests/system/serve_stale/ns3/named8.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns3/named8.conf.j2 rename to bin/tests/system/serve_stale/ns3/named8.conf.j2 diff --git a/bin/tests/system/serve-stale/ns3/named9.conf.j2 b/bin/tests/system/serve_stale/ns3/named9.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns3/named9.conf.j2 rename to bin/tests/system/serve_stale/ns3/named9.conf.j2 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.j2 b/bin/tests/system/serve_stale/ns4/named.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns4/named.conf.j2 rename to bin/tests/system/serve_stale/ns4/named.conf.j2 diff --git a/bin/tests/system/serve-stale/ns5/named.conf.j2 b/bin/tests/system/serve_stale/ns5/named.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns5/named.conf.j2 rename to bin/tests/system/serve_stale/ns5/named.conf.j2 diff --git a/bin/tests/system/serve-stale/ns6/named.conf.j2 b/bin/tests/system/serve_stale/ns6/named.conf.j2 similarity index 100% rename from bin/tests/system/serve-stale/ns6/named.conf.j2 rename to bin/tests/system/serve_stale/ns6/named.conf.j2 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/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.j2 b/bin/tests/system/transport_acl/ns1/named.conf.j2 similarity index 100% rename from bin/tests/system/transport-acl/ns1/named.conf.j2 rename to bin/tests/system/transport_acl/ns1/named.conf.j2 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-proxy.conf.j2 b/bin/tests/system/transport_change/ns1/named-http-plain-proxy.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-http-plain-proxy.conf.j2 rename to bin/tests/system/transport_change/ns1/named-http-plain-proxy.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-http-plain.conf.j2 b/bin/tests/system/transport_change/ns1/named-http-plain.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-http-plain.conf.j2 rename to bin/tests/system/transport_change/ns1/named-http-plain.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-https-proxy-encrypted.conf.j2 b/bin/tests/system/transport_change/ns1/named-https-proxy-encrypted.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-https-proxy-encrypted.conf.j2 rename to bin/tests/system/transport_change/ns1/named-https-proxy-encrypted.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-https-proxy-plain.conf.j2 b/bin/tests/system/transport_change/ns1/named-https-proxy-plain.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-https-proxy-plain.conf.j2 rename to bin/tests/system/transport_change/ns1/named-https-proxy-plain.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-https.conf.j2 b/bin/tests/system/transport_change/ns1/named-https.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-https.conf.j2 rename to bin/tests/system/transport_change/ns1/named-https.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-proxy.conf.j2 b/bin/tests/system/transport_change/ns1/named-proxy.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-proxy.conf.j2 rename to bin/tests/system/transport_change/ns1/named-proxy.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-tls-proxy-encrypted.conf.j2 b/bin/tests/system/transport_change/ns1/named-tls-proxy-encrypted.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-tls-proxy-encrypted.conf.j2 rename to bin/tests/system/transport_change/ns1/named-tls-proxy-encrypted.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-tls-proxy-plain.conf.j2 b/bin/tests/system/transport_change/ns1/named-tls-proxy-plain.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-tls-proxy-plain.conf.j2 rename to bin/tests/system/transport_change/ns1/named-tls-proxy-plain.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-tls.conf.j2 b/bin/tests/system/transport_change/ns1/named-tls.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-tls.conf.j2 rename to bin/tests/system/transport_change/ns1/named-tls.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named.conf.j2 b/bin/tests/system/transport_change/ns1/named.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named.conf.j2 rename to bin/tests/system/transport_change/ns1/named.conf.j2 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 diff --git a/bin/tests/system/xfer-servers-list/ns1/named.conf.j2 b/bin/tests/system/xfer_servers_list/ns1/named.conf.j2 similarity index 100% rename from bin/tests/system/xfer-servers-list/ns1/named.conf.j2 rename to bin/tests/system/xfer_servers_list/ns1/named.conf.j2 diff --git a/bin/tests/system/xfer-servers-list/ns1/test.db.j2 b/bin/tests/system/xfer_servers_list/ns1/test.db.j2 similarity index 100% rename from bin/tests/system/xfer-servers-list/ns1/test.db.j2 rename to bin/tests/system/xfer_servers_list/ns1/test.db.j2 diff --git a/bin/tests/system/xfer-servers-list/ns2/named.conf.j2 b/bin/tests/system/xfer_servers_list/ns2/named.conf.j2 similarity index 100% rename from bin/tests/system/xfer-servers-list/ns2/named.conf.j2 rename to bin/tests/system/xfer_servers_list/ns2/named.conf.j2 diff --git a/bin/tests/system/xfer-servers-list/ns3/named.conf.j2 b/bin/tests/system/xfer_servers_list/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/xfer-servers-list/ns3/named.conf.j2 rename to bin/tests/system/xfer_servers_list/ns3/named.conf.j2 diff --git a/bin/tests/system/xfer-servers-list/ns4/named.conf.j2 b/bin/tests/system/xfer_servers_list/ns4/named.conf.j2 similarity index 100% rename from bin/tests/system/xfer-servers-list/ns4/named.conf.j2 rename to bin/tests/system/xfer_servers_list/ns4/named.conf.j2 diff --git a/bin/tests/system/xfer-servers-list/tests_xfer_servers_list.py b/bin/tests/system/xfer_servers_list/tests_xfer_servers_list.py similarity index 100% rename from bin/tests/system/xfer-servers-list/tests_xfer_servers_list.py rename to bin/tests/system/xfer_servers_list/tests_xfer_servers_list.py