update unit tests

Author: AlyaGomaa

conftest.py

@@ -9,6 +9,7 @@
 import os
 import sys
 import inspect
+import importlib
 from multiprocessing import Queue
 from unittest.mock import patch
 from slips_files.core.database.database_manager import DBManager
@@ -23,6 +24,11 @@
 parent_dir = os.path.dirname(current_dir)
 sys.path.insert(0, parent_dir)
 
+# Keep legacy test imports working after the fides package rename.
+sys.modules.setdefault(
+    "modules.fides_module", importlib.import_module("modules.fides")
+)
+
 
 # Suppress TensorFlow logs from C++ backend
 os.environ["TF_CPP_MIN_LOG_LEVEL"] = "3"  # 3 = ERROR

tests/integration/test_zeek_dataset.py

@@ -124,7 +124,7 @@
             "dataset/test9-mixed-zeek-dir/conn.log",
             4,
             "non-HTTP established connection to port 80. "
-            "destination IP: 194.132.197.198",  # the flows with uid
+            "destination IP: 194.132.197.198",  # the flow with uid
             # CAwUdr34dVnyOwbUuj should trigger this
             "test9-conn_log_only/",
             6659,

tests/unit/managers/test_slips.py

@@ -10,6 +10,7 @@ def test_load_modules():
     proc_manager.modules_to_ignore = [
         "template",
         "mldetection-1",
+        "fides",
     ]
     failed_to_load_modules = proc_manager.get_modules()[1]
     assert failed_to_load_modules == 0

tests/unit/slips_files/common/test_output_paths.py

@@ -2,18 +2,20 @@
 
 from slips_files.common.output_paths import (
     DATABASES_DIRNAME,
-    get_output_databases_dir,
-    get_output_sqlite_path,
+    get_databases_dir_path_inside_output_dir,
+    get_this_db_path_inside_output_dir,
 )
 from tests.module_factory import ModuleFactory
 
 
-def test_get_output_databases_dir_creates_directory(tmp_path):
+def test_get_databases_dir_path_inside_output_dir_creates_directory(tmp_path):
     """The databases helper should create and return the output databases directory."""
     module_factory = ModuleFactory()
     assert module_factory is not None
 
-    databases_dir = get_output_databases_dir(str(tmp_path / "output"))
+    databases_dir = get_databases_dir_path_inside_output_dir(
+        str(tmp_path / "output")
+    )
 
     assert databases_dir.endswith(DATABASES_DIRNAME)
     assert (tmp_path / "output" / DATABASES_DIRNAME).is_dir()
@@ -24,6 +26,8 @@ def test_get_output_sqlite_path_joins_filename_under_databases_dir(tmp_path):
     module_factory = ModuleFactory()
     assert module_factory is not None
 
-    sqlite_path = get_output_sqlite_path(str(tmp_path / "output"), "test.db")
+    sqlite_path = get_this_db_path_inside_output_dir(
+        str(tmp_path / "output"), "test.db"
+    )
 
     assert sqlite_path.endswith(f"{DATABASES_DIRNAME}/test.db")

tests/unit/slips_files/core/database/test_database.py

@@ -10,6 +10,7 @@
 import os
 
 from slips_files.core.flows.zeek import Conn
+from slips_files.core.database.database_manager import DBManager
 from slips_files.core.database.redis_db.database import RedisDB
 from tests.module_factory import ModuleFactory
 
@@ -163,44 +164,33 @@ def test_setup_config_file_uses_isolated_path_and_preserves_save(
     )
 
     monkeypatch.setattr(RedisDB, "_conf_file_template", str(template))
-    monkeypatch.setattr(RedisDB, "output_dir", tmp_path)
-    monkeypatch.setattr(RedisDB, "redis_port", 6379)
-    monkeypatch.setattr(RedisDB, "args", Mock(save=False))
+    monkeypatch.setattr(RedisDB, "output_dir", tmp_path, raising=False)
+    monkeypatch.setattr(RedisDB, "redis_port", 6379, raising=False)
+    monkeypatch.setattr(RedisDB, "args", Mock(save=False), raising=False)
 
     RedisDB._setup_config_file()
 
     expected_conf = (
-        tmp_path / f"redis-server-port-{RedisDB.redis_port}-{os.getpid()}.conf"
+        tmp_path / "redis" / f"redis-server-port-{RedisDB.redis_port}.conf"
     )
     assert RedisDB._conf_file == str(expected_conf)
 
     conf_contents = expected_conf.read_text(encoding="utf-8").splitlines()
     assert 'save ""' in conf_contents
     assert (
-        f"logfile {tmp_path / f'redis-server-port-{RedisDB.redis_port}.log'}"
+        f"logfile {tmp_path / 'redis' / f'redis-server-port-{RedisDB.redis_port}.log'}"
         in conf_contents
     )
 
 
-def test_get_permanent_database_path_uses_configured_dir(
-    tmp_path, monkeypatch
-):
-    db = ModuleFactory().create_db_manager_obj(6379)
-    monkeypatch.chdir(tmp_path)
-    db.conf.permanent_dir = Mock(return_value="persistent_state")
-
-    path = db.get_permanent_database_path("shared.sqlite")
-
-    assert path == os.path.join(
-        "persistent_state", "databases", "shared.sqlite"
-    )
-    assert os.path.isdir(os.path.join("persistent_state", "databases"))
-
-
 def test_init_p2p_trust_db_uses_permanent_dir(tmp_path, monkeypatch):
     db = ModuleFactory().create_db_manager_obj(6379)
     monkeypatch.chdir(tmp_path)
-    db.conf.permanent_dir = Mock(return_value="persistent_state")
+    db.init_p2p_trust_db = DBManager.init_p2p_trust_db.__get__(db, DBManager)
+    monkeypatch.setattr(
+        "slips_files.core.database.database_manager.get_this_filepath_inside_permanent_dir",
+        lambda filename: os.path.join("persistent_state", filename),
+    )
 
     db_path = db.init_p2p_trust_db()
 

tests/unit/slips_files/core/test_evidence_handler.py

@@ -55,7 +55,7 @@ def test_start_evidence_worker(mock_worker_cls):
 
     mock_worker_cls.assert_called_once_with(
         logger=handler.logger,
-        output_dir=handler.output_dir,
+        output_dir=handler.parent_output_dir,
         redis_port=handler.redis_port,
         termination_event=handler.termination_event,
         conf=handler.conf,

tests/unit/slips_files/core/test_profiler.py

@@ -1,11 +1,11 @@
 # SPDX-FileCopyrightText: 2021 Sebastian Garcia <sebastian.garcia@agents.fel.cvut.cz>
 # SPDX-License-Identifier: GPL-2.0-only
-"""Unit test for slips_files/core/iperformance_profiler.py"""
+"""Unit tests for the profiler core process."""
 
 from unittest.mock import Mock, patch
 
-from tests.module_factory import ModuleFactory
 import pytest
+from tests.module_factory import ModuleFactory
 
 
 def mock_print(*args, **kwargs):
@@ -136,3 +136,39 @@ def test_notify_observers_with_correct_message():
     test_msg = {"action": "test_action"}
     profiler.notify_observers(test_msg)
     observer_mock.update.assert_called_once_with(test_msg)
+
+
+@patch("slips_files.core.profiler.ProfilerWorker")
+def test_start_profiler_worker_uses_parent_output_dir(mock_worker_cls):
+    profiler = ModuleFactory().create_profiler_obj()
+    worker = mock_worker_cls.return_value
+    profiler.profiler_child_processes = []
+    profiler.workers = []
+    profiler.profiler_queue = Mock()
+    profiler.input_handler_obj = Mock()
+    profiler.aid_queue = Mock()
+    profiler.aid_manager = Mock()
+    profiler.is_input_done_event = Mock()
+
+    profiler.start_profiler_worker(7)
+
+    mock_worker_cls.assert_called_once_with(
+        logger=profiler.logger,
+        output_dir=profiler.parent_output_dir,
+        redis_port=profiler.redis_port,
+        termination_event=profiler.termination_event,
+        conf=profiler.conf,
+        ppid=profiler.ppid,
+        slips_args=profiler.args,
+        bloom_filters_manager=profiler.bloom_filters,
+        name="profiler_worker_process_7",
+        profiler_queue=profiler.profiler_queue,
+        input_handler=profiler.input_handler_obj,
+        aid_queue=profiler.aid_queue,
+        aid_manager=profiler.aid_manager,
+        is_input_done_event=profiler.is_input_done_event,
+    )
+    worker.start.assert_called_once()
+    assert profiler.profiler_child_processes == [worker]
+    assert profiler.workers == []
+    profiler.db.increment_profiler_workers_started.assert_called_once()