hitlogs should use same paths as other reporting. add test for this (#387)

Author: leondz

garak/evaluators/base.py

@@ -6,6 +6,7 @@
 
 import json
 import logging
+import os
 from typing import List
 
 from colorama import Fore, Style
@@ -64,16 +65,14 @@ def evaluate(self, attempts: List[garak.attempt.Attempt]) -> None:
                     if not self.test(score):  # if we don't pass
                         if not _config.transient.hitlogfile:
                             if not _config.system.report_prefix:
-                                hitlog_filename = (
-                                    f"garak.{_config.transient.run_id}.hitlog.jsonl"
-                                )
+                                hitlog_filename = f"{_config.transient.report_dir}/garak.{_config.transient.run_id}.hitlog.jsonl"
                             else:
                                 hitlog_filename = (
                                     _config.system.report_prefix + ".hitlog.jsonl"
                                 )
                             logging.info("hit log in %s", hitlog_filename)
                             _config.transient.hitlogfile = open(
-                                _config.transient.report_dir + "/" + hitlog_filename,
+                                hitlog_filename,
                                 "w",
                                 buffering=1,
                                 encoding="utf-8",

tests/test_config.py

@@ -431,16 +431,6 @@ def test_probespec_loading():
     ]
 
 
-@pytest.fixture(scope="session", autouse=True)
-def cleanup(request):
-    """Cleanup a testing directory once we are finished."""
-
-    def remove_laurelhurst_log():
-        os.remove("laurelhurst.report.jsonl")
-
-    request.addfinalizer(remove_laurelhurst_log)
-
-
 def test_buff_config_assertion():
     importlib.reload(_config)
     import garak._plugins
@@ -462,3 +452,27 @@ def test_tag_filter():
     assert "probes.lmrc.SexualContent" in _config.parse_plugin_spec(
         "all", "probes", probe_tag_filter="risk-cards:lmrc:sexual_content"
     )
+
+
+def test_report_prefix_with_hitlog_no_explode():
+    importlib.reload(_config)
+
+    garak.cli.main(
+        "-m test.Blank --report_prefix kjsfhgkjahpsfdg -p test.Blank -d always.Fail".split()
+    )
+    assert os.path.isfile("kjsfhgkjahpsfdg.report.jsonl")
+    assert os.path.isfile("kjsfhgkjahpsfdg.report.html")
+    assert os.path.isfile("kjsfhgkjahpsfdg.hitlog.jsonl")
+
+
+@pytest.fixture(scope="session", autouse=True)
+def cleanup(request):
+    """Cleanup a testing directory once we are finished."""
+
+    def remove_laurelhurst_log():
+        os.remove("laurelhurst.report.jsonl")
+        os.remove("kjsfhgkjahpsfdg.report.jsonl")
+        os.remove("kjsfhgkjahpsfdg.report.html")
+        os.remove("kjsfhgkjahpsfdg.hitlog.jsonl")
+
+    request.addfinalizer(remove_laurelhurst_log)