mirror project structure in tests/

Author: AlyaGomaa

.github/workflows/integration-tests.yml

@@ -12,7 +12,7 @@ jobs:
     uses: ./.github/workflows/install-slips-dependencies.yml
 
 
-  integration-tests:
+  e2e-tests:
     runs-on: ubuntu-22.04
     timeout-minutes: 1800
     # make this job depend on the first job
@@ -83,14 +83,14 @@ jobs:
       run: (command -v zeek && zeek --version) || (command -v bro && bro --version)
 
 
-    - name: Run Integration Tests for ${{ matrix.test_file }}
+    - name: Run e2e Tests for ${{ matrix.test_file }}
       run: |
-        python3 -m pytest tests/integration_tests/${{ matrix.test_file }} -p no:warnings -vv -s -n 3
+        python3 -m pytest tests/e2e/${{ matrix.test_file }} -p no:warnings -vv -s -n 3
 
     - name: Upload Artifacts
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ matrix.test_file }}-integration-tests-output
+        name: ${{ matrix.test_file }}-e2e-tests-output
         path: |
           output/integration_tests

.github/workflows/unit-tests.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         test_file:
-          - test_inputProc.py
+          - test_input.py
           - test_main.py
           - test_conn.py
           - test_downloaded_file.py

modules/fidesModule/fidesModule.py

@@ -1,6 +1,5 @@
 import os
 import json
-from dataclasses import asdict
 from pathlib import Path
 
 from slips_files.common.slips_utils import utils
@@ -12,11 +11,10 @@
     dict_to_alert,
     Alert,
 )
-from .messaging.model import NetworkMessage
 from ..fidesModule.messaging.message_handler import MessageHandler
 from ..fidesModule.messaging.network_bridge import NetworkBridge
 from ..fidesModule.model.configuration import load_configuration
-from ..fidesModule.model.threat_intelligence import SlipsThreatIntelligence, ThreatIntelligence
+from ..fidesModule.model.threat_intelligence import SlipsThreatIntelligence
 from ..fidesModule.protocols.alert import AlertProtocol
 from ..fidesModule.protocols.initial_trusl import InitialTrustProtocol
 from ..fidesModule.protocols.opinion import OpinionAggregator
@@ -26,15 +24,13 @@
     ThreatIntelligenceProtocol,
 )
 from ..fidesModule.utils.logger import LoggerPrintCallbacks
-from ..fidesModule.messaging.redis_simplex_queue import RedisSimplexQueue, RedisDuplexQueue
+from ..fidesModule.messaging.redis_simplex_queue import RedisSimplexQueue
 from ..fidesModule.persistence.threat_intelligence_db import (
     SlipsThreatIntelligenceDatabase,
 )
 from ..fidesModule.persistence.trust_db import SlipsTrustDatabase
 from ..fidesModule.persistence.sqlite_db import SQLiteDB
 
-from ..fidesModule.model.alert import Alert as FidesAlert
-
 
 class FidesModule(IModule):
     """
@@ -230,6 +226,6 @@ def main(self):
             self.__intelligence.request_data(ip)
 
         # TODO: the code below exists for testing purposes for
-        #  tests/integration_tests/test_fides.py
+        #  tests/e2e/test_fides.py
         if msg := self.get_msg("fides2network"):
             pass

tests/common_test_utils.py

@@ -112,7 +112,7 @@ def is_evidence_present(log_file, expected_evidence):
 
 def create_output_dir(dirname) -> PosixPath:
     """
-    creates this output dir inside output/integration_tests/
+    creates this output dir inside output/e2e/
     returns a full path to the created output dir
     """
 

tests/destrctor.py tests/destructor.pytests/destrctor.py renamed to tests/destructor.py

@@ -105,10 +105,4 @@ def kill_redis_server(pid):
         except redis.exceptions.ConnectionError:
             continue
 
-    print(f"Closed {closed_servers} unused redis-servers")
-
-    zeek_tmp_dir = os.path.join(os.getcwd(), "zeek_dir_for_testing")
-    try:
-        os.rmdir(zeek_tmp_dir)
-    except (FileNotFoundError, OSError):
-        pass
+    print(f"Closed {closed_servers} redis servers")

tests/integration_tests/__init__.py tests/e2e/__init__.pytests/integration_tests/__init__.py renamed to tests/e2e/__init__.py

@@ -429,4 +429,3 @@ local_p2p:
    # create p2p.log with additional info about peer communications?
    create_p2p_logfile : False
    use_p2p : False
-

…/integration_tests/config/fides.conf.yml tests/e2e/config/fides.conf.ymltests/integration_tests/config/fides.conf.yml renamed to tests/e2e/config/fides.conf.yml tests/integration_tests/config/fides.conf.yml renamed to tests/e2e/config/fides.conf.yml

@@ -45,7 +45,7 @@ def test_conf_file(pcap_path, expected_profiles, output_dir, redis_port):
     """
     In this test we're using tests/test.conf
     """
-    config_file = "tests/integration_tests/test.yaml"
+    config_file = "tests/e2e/test.yaml"
     modify_yaml_config(
         output_filename=config_file,
         output_dir=os.getcwd(),
@@ -147,7 +147,7 @@ def test_conf_file2(pcap_path, expected_profiles, output_dir, redis_port):
     """
     In this test we're using tests/test2.conf
     """
-    config_file = "tests/integration_tests/test2.yaml"
+    config_file = "tests/e2e/test2.yaml"
     modify_yaml_config(
         output_filename=config_file,
         output_dir=os.getcwd(),