From 52f9e6f55759ae86925c7d66c3dfa1621096e06c Mon Sep 17 00:00:00 2001
From: Tom Krizek <tkrizek@isc.org>
Date: Thu, 15 Feb 2024 13:57:42 +0100
Subject: [PATCH] Move watchlog module into isctest.log package

Preparation for further logging improvements - keep the watchlog
contents in a separate module inside isctest.log. Export the names in
the log package so the imports don't change for the users of these
classes.
---
 bin/tests/system/isctest/log/__init__.py             | 12 ++++++++++++
 bin/tests/system/isctest/{log.py => log/watchlog.py} |  4 +---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 bin/tests/system/isctest/log/__init__.py
 rename bin/tests/system/isctest/{log.py => log/watchlog.py} (99%)

diff --git a/bin/tests/system/isctest/log/__init__.py b/bin/tests/system/isctest/log/__init__.py
new file mode 100644
index 0000000000..56b796334c
--- /dev/null
+++ b/bin/tests/system/isctest/log/__init__.py
@@ -0,0 +1,12 @@
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0.  If a copy of the MPL was not distributed with this
+# file, you can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+from .watchlog import LogFile, WatchLogFromStart, WatchLogFromHere
diff --git a/bin/tests/system/isctest/log.py b/bin/tests/system/isctest/log/watchlog.py
similarity index 99%
rename from bin/tests/system/isctest/log.py
rename to bin/tests/system/isctest/log/watchlog.py
index 236cfdae3a..1931f13aff 100644
--- a/bin/tests/system/isctest/log.py
+++ b/bin/tests/system/isctest/log/watchlog.py
@@ -9,12 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from typing import Iterator, Optional, TextIO, Dict, Any, overload, List, Union
+from typing import Iterator, Optional, TextIO, Dict, Any
 
 import abc
 import os
-import shlex
-import subprocess
 import time