Fix failing test

Signed-off-by: Keshav Priyadarshi <git@keshav.space>

Author: keshav-space

vulnerabilities/pipelines/__init__.py

@@ -18,7 +18,8 @@
 from vulnerabilities.importer import AdvisoryData
 from vulnerabilities.improver import MAX_CONFIDENCE
 from vulnerabilities.models import Advisory
-from vulnerabilities.pipes import advisory
+from vulnerabilities.pipes.advisory import import_advisory
+from vulnerabilities.pipes.advisory import insert_advisory
 from vulnerabilities.utils import classproperty
 
 module_logger = logging.getLogger(__name__)
@@ -85,7 +86,7 @@ def collect_and_store_advisories(self):
         collected_advisory_count = 0
         progress = LoopProgress(total_iterations=self.advisories_count(), logger=self.log)
         for advisory in progress.iter(self.collect_advisories()):
-            if _obj := advisory.insert_advisory(
+            if _obj := insert_advisory(
                 advisory=advisory,
                 pipeline_name=self.qualified_name,
                 logger=self.log,
@@ -115,7 +116,7 @@ def import_new_advisories(self):
 
     def import_advisory(self, advisory: Advisory) -> int:
         try:
-            advisory.import_advisory(
+            import_advisory(
                 advisory=advisory,
                 pipeline_name=self.qualified_name,
                 confidence=self.advisory_confidence,

vulnerabilities/tests/__init__.py

@@ -31,15 +31,16 @@
 )
 
 
-advisory1 = models.Advisory(
-    aliases=advisory_data1.aliases,
-    summary=advisory_data1.summary,
-    affected_packages=[pkg.to_dict() for pkg in advisory_data1.affected_packages],
-    references=[ref.to_dict() for ref in advisory_data1.references],
-    url=advisory_data1.url,
-    created_by="tests",
-    date_collected=timezone.now(),
-)
+def get_advisory1(created_by="test_pipeline"):
+    return models.Advisory.objects.create(
+        aliases=advisory_data1.aliases,
+        summary=advisory_data1.summary,
+        affected_packages=[pkg.to_dict() for pkg in advisory_data1.affected_packages],
+        references=[ref.to_dict() for ref in advisory_data1.references],
+        url=advisory_data1.url,
+        created_by=created_by,
+        date_collected=timezone.now(),
+    )
 
 
 def get_all_vulnerability_relationships_objects():

vulnerabilities/tests/pipelines/test_base_pipeline.py

@@ -13,8 +13,8 @@
 
 from vulnerabilities import models
 from vulnerabilities.pipelines import VulnerableCodeBaseImporterPipeline
-from vulnerabilities.tests import advisory1
 from vulnerabilities.tests import advisory_data1
+from vulnerabilities.tests import get_advisory1
 
 
 class TestVulnerableCodeBaseImporterPipeline(TestCase):
@@ -50,7 +50,7 @@ def test_import_new_advisories(self):
         self.assertEqual(0, models.Vulnerability.objects.count())
 
         base_pipeline = VulnerableCodeBaseImporterPipeline()
-        base_pipeline.new_advisories = [advisory1]
+        advisory1 = get_advisory1(created_by=base_pipeline.qualified_name)
         base_pipeline.import_new_advisories()
 
         self.assertEqual(1, models.Vulnerability.objects.count())

…erabilities/tests/pipes/test_importer.py …erabilities/tests/pipes/test_advisory.pyvulnerabilities/tests/pipes/test_importer.py renamed to vulnerabilities/tests/pipes/test_advisory.py vulnerabilities/tests/pipes/test_importer.py renamed to vulnerabilities/tests/pipes/test_advisory.py

@@ -9,13 +9,14 @@
 
 import pytest
 
-from vulnerabilities.pipes.importer import import_advisory
-from vulnerabilities.tests import advisory1
+from vulnerabilities.pipes.advisory import import_advisory
+from vulnerabilities.tests import get_advisory1
 from vulnerabilities.tests import get_all_vulnerability_relationships_objects
 
 
 @pytest.mark.django_db
 def test_vulnerability_pipes_importer_import_advisory():
+    advisory1 = get_advisory1(created_by="test_importer_pipeline")
     import_advisory(advisory=advisory1, pipeline_name="test_importer_pipeline")
     all_vulnerability_relation_objects = get_all_vulnerability_relationships_objects()
     import_advisory(advisory=advisory1, pipeline_name="test_importer_pipeline")
@@ -24,6 +25,7 @@ def test_vulnerability_pipes_importer_import_advisory():
 
 @pytest.mark.django_db
 def test_vulnerability_pipes_importer_import_advisory_different_pipelines():
+    advisory1 = get_advisory1(created_by="test_importer_pipeline")
     import_advisory(advisory=advisory1, pipeline_name="test_importer1_pipeline")
     all_vulnerability_relation_objects = get_all_vulnerability_relationships_objects()
     import_advisory(advisory=advisory1, pipeline_name="test_importer2_pipeline")