From 4652da6caf2dec8405cdec46f2528e09490437fc Mon Sep 17 00:00:00 2001
From: Tom Krizek <tkrizek@isc.org>
Date: Fri, 14 Oct 2022 11:12:53 +0200
Subject: [PATCH] Use common name convention for pytest files

It is better to use consistent file names to avoid issue with sorting
etc.

Using underscore in filenames as opposed to dash was chosen because it
seems more common in pytest/python to use underscore for filenames.

Also rename the bin/tests/system/timeouts/tests-tcp.py file to
bin/tests/system/timeouts/tests_tcp_timeouts.py to avoid pytest name
collision (there can't be two files named tests_tcp.py).

(cherry picked from commit f6409ee6ac5913c6f90545a44c4346945d911162)
---
 bin/tests/system/checkds/{tests-checkds.py => tests_checkds.py}   | 0
 .../system/dispatch/{tests-connreset.py => tests_connreset.py}    | 0
 ...ests-rpz-passthru-logging.py => tests_rpz_passthru_logging.py} | 0
 .../system/shutdown/{tests-shutdown.py => tests_shutdown.py}      | 0
 bin/tests/system/statschannel/{tests-json.py => tests_json.py}    | 0
 bin/tests/system/statschannel/{tests-xml.py => tests_xml.py}      | 0
 bin/tests/system/tcp/{tests-tcp.py => tests_tcp.py}               | 0
 bin/tests/system/timeouts/{tests-tcp.py => tests_tcp_timeouts.py} | 0
 .../system/wildcard/{tests-wildcard.py => tests_wildcard.py}      | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename bin/tests/system/checkds/{tests-checkds.py => tests_checkds.py} (100%)
 rename bin/tests/system/dispatch/{tests-connreset.py => tests_connreset.py} (100%)
 rename bin/tests/system/rpzextra/{tests-rpz-passthru-logging.py => tests_rpz_passthru_logging.py} (100%)
 rename bin/tests/system/shutdown/{tests-shutdown.py => tests_shutdown.py} (100%)
 rename bin/tests/system/statschannel/{tests-json.py => tests_json.py} (100%)
 rename bin/tests/system/statschannel/{tests-xml.py => tests_xml.py} (100%)
 rename bin/tests/system/tcp/{tests-tcp.py => tests_tcp.py} (100%)
 rename bin/tests/system/timeouts/{tests-tcp.py => tests_tcp_timeouts.py} (100%)
 rename bin/tests/system/wildcard/{tests-wildcard.py => tests_wildcard.py} (100%)

diff --git a/bin/tests/system/checkds/tests-checkds.py b/bin/tests/system/checkds/tests_checkds.py
similarity index 100%
rename from bin/tests/system/checkds/tests-checkds.py
rename to bin/tests/system/checkds/tests_checkds.py
diff --git a/bin/tests/system/dispatch/tests-connreset.py b/bin/tests/system/dispatch/tests_connreset.py
similarity index 100%
rename from bin/tests/system/dispatch/tests-connreset.py
rename to bin/tests/system/dispatch/tests_connreset.py
diff --git a/bin/tests/system/rpzextra/tests-rpz-passthru-logging.py b/bin/tests/system/rpzextra/tests_rpz_passthru_logging.py
similarity index 100%
rename from bin/tests/system/rpzextra/tests-rpz-passthru-logging.py
rename to bin/tests/system/rpzextra/tests_rpz_passthru_logging.py
diff --git a/bin/tests/system/shutdown/tests-shutdown.py b/bin/tests/system/shutdown/tests_shutdown.py
similarity index 100%
rename from bin/tests/system/shutdown/tests-shutdown.py
rename to bin/tests/system/shutdown/tests_shutdown.py
diff --git a/bin/tests/system/statschannel/tests-json.py b/bin/tests/system/statschannel/tests_json.py
similarity index 100%
rename from bin/tests/system/statschannel/tests-json.py
rename to bin/tests/system/statschannel/tests_json.py
diff --git a/bin/tests/system/statschannel/tests-xml.py b/bin/tests/system/statschannel/tests_xml.py
similarity index 100%
rename from bin/tests/system/statschannel/tests-xml.py
rename to bin/tests/system/statschannel/tests_xml.py
diff --git a/bin/tests/system/tcp/tests-tcp.py b/bin/tests/system/tcp/tests_tcp.py
similarity index 100%
rename from bin/tests/system/tcp/tests-tcp.py
rename to bin/tests/system/tcp/tests_tcp.py
diff --git a/bin/tests/system/timeouts/tests-tcp.py b/bin/tests/system/timeouts/tests_tcp_timeouts.py
similarity index 100%
rename from bin/tests/system/timeouts/tests-tcp.py
rename to bin/tests/system/timeouts/tests_tcp_timeouts.py
diff --git a/bin/tests/system/wildcard/tests-wildcard.py b/bin/tests/system/wildcard/tests_wildcard.py
similarity index 100%
rename from bin/tests/system/wildcard/tests-wildcard.py
rename to bin/tests/system/wildcard/tests_wildcard.py