Fix py move-results to use ConfigParser

The Python 3 based "move-results" code was using the old `configtools`
module instead of just using `ConfigParser` directly.  This would end
up causing failures in the unit tests because it was calling the
`parse_args` method of `configtools` to first parse the command line
arguments.  But in principle, we never want to access the command line
arguments while running unit tests.  The unit test should provide them
for the method under test to properly ensure the correct behavior is
tested.

We simply replace the use of `configtools` with `ConfigParser` directly,
which ends up simplifying the code as well.

Further, using configtools just for the result directory `metadata.log`
is over kill, because `configtools` was there to support multiple
configuration files, and there is only one `metadata.log` file.

We remove the `SETUP` and `TEARDOWN` messages since they are really
debugging statements and have no business being there for normal test
operation.

Author: portante

lib/pbench/agent/results.py

@@ -5,11 +5,11 @@
 import sys
 import tarfile
 
+from configparser import ConfigParser
 from pathlib import Path
+
 from werkzeug.utils import secure_filename
 
-from pbench.cli.agent.commands.log import add_metalog_option
-from pbench.common import configtools
 from pbench.common.utils import md5sum
 
 
@@ -62,18 +62,17 @@ def make_result_tb(self):
             )
             sys.exit(0)
 
+        mdlog_name = self.result_dir / "metadata.log"
+        mdlog = ConfigParser()
         try:
-            md_log = (self.result_dir / "metadata.log").resolve(strict=True)
+            with mdlog_name.open("r") as fp:
+                mdlog.read_file(fp)
         except FileNotFoundError:
             self.logger.debug(
                 "The {}/metadata.log file seems to be missing", pbench_run_name
             )
             sys.exit(0)
-
-        opts, _ = configtools.parse_args()
-        opts.filename = md_log
-        conf_md, _ = configtools.init(opts, None)
-        md_config = conf_md["pbench"]
+        md_config = mdlog["pbench"]
         res_name = md_config.get("name")
         if res_name != pbench_run_name:
             self.logger.warning(
@@ -85,22 +84,23 @@ def make_result_tb(self):
             sys.exit(1)
 
         if self.user:
-            add_metalog_option(md_log, "run", "user", self.user)
+            mdlog.set("run", "user", self.user)
 
         if self.prefix:
-            add_metalog_option(md_log, "run", "prefix", self.prefix)
+            mdlog.set("run", "prefix", self.prefix)
 
         # FIXME: subprocess "du" command
         result_size = sum(f.stat().st_size for f in self.result_dir.rglob("*"))
         self.logger.debug(
             "preparing to tar up {} bytes of data from {}", result_size, self.result_dir
         )
-        add_metalog_option(md_log, "run", "raw_size", f"{result_size}")
+        mdlog.set("run", "raw_size", f"{result_size}")
 
         timestamp = datetime.datetime.isoformat(datetime.datetime.now())
-        add_metalog_option(
-            md_log, "pbench", "tar-ball-creation-timestamp", f"{timestamp}"
-        )
+        mdlog.set("pbench", "tar-ball-creation-timestamp", f"{timestamp}")
+
+        with mdlog_name.open("w") as fp:
+            mdlog.write(fp)
 
         # FIXME: subprocess "tar" command
         tarball = self.target_dir / f"{pbench_run_name}.tar.xz"

lib/pbench/test/unit/agent/conftest.py

@@ -7,7 +7,6 @@
 
 def base_setup(request, pytestconfig):
     """Test package setup for pbench-agent"""
-    print("Test SETUP for pbench-agent")
 
     # Create a single temporary directory for the "/opt/pbench-agent" and
     # "/var/lib/pbench-agent" directories.
@@ -32,7 +31,6 @@ def base_setup(request, pytestconfig):
 
     def teardown():
         """Test package teardown for pbench-agent"""
-        print("Test TEARDOWN for pbench-agent")
         TMP.cleanup()
 
     request.addfinalizer(teardown)

lib/pbench/test/unit/server/conftest.py

@@ -37,7 +37,6 @@
 @pytest.fixture(scope="session", autouse=True)
 def setup(request, pytestconfig):
     """Test package setup for pbench-server"""
-    print("\nTest SETUP for pbench-server")
 
     # Create a single temporary directory for the "/srv/pbench" and
     # "/opt/pbench-server" directories.
@@ -75,7 +74,6 @@ def setup(request, pytestconfig):
 
     def teardown():
         """Test package teardown for pbench-server"""
-        print("\nTest TEARDOWN for pbench-server")
         TMP.cleanup()
 
     request.addfinalizer(teardown)