rework deduplication tests

blacklanternsecurity · Oct 10, 2023 · bfa65f6 · bfa65f6
1 parent 4483791
commit bfa65f6
Show file tree

Hide file tree

Showing 5 changed files with 180 additions and 211 deletions.
diff --git a/bbot/modules/base.py b/bbot/modules/base.py
@@ -922,6 +922,10 @@ def _incoming_dedup_hash(self, event):
         """
         Determines the criteria for what is considered to be a duplicate event if `accept_dupes` is False.
         """
+        if self.per_host_only:
+            return self.get_per_host_hash(event)
+        elif self.per_domain_only:
+            return self.get_per_domain_hash(event)
         return hash(event)
 
     def _outgoing_dedup_hash(self, event):

diff --git a/bbot/test/conftest.py b/bbot/test/conftest.py
@@ -18,7 +18,7 @@ def pytest_sessionfinish(session, exitstatus):
             logger.removeHandler(handler)
 
     # Wipe out BBOT home dir
-    shutil.rmtree("/tmp/.bbot_test", ignore_errors=True)
+    # shutil.rmtree("/tmp/.bbot_test", ignore_errors=True)
 
     yield
 

diff --git a/bbot/test/test_step_1/test_manager.py b/bbot/test/test_step_1/test_manager.py