Fix tests

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

vulnerabilities/importers/__init__.py

@@ -45,11 +45,11 @@
 from vulnerabilities.pipelines import pysec_importer
 from vulnerabilities.pipelines.v2_importers import apache_httpd_importer as apache_httpd_v2
 from vulnerabilities.pipelines.v2_importers import github_importer as github_importer_v2
+from vulnerabilities.pipelines.v2_importers import gitlab_importer as gitlab_importer_v2
 from vulnerabilities.pipelines.v2_importers import npm_importer as npm_importer_v2
 from vulnerabilities.pipelines.v2_importers import nvd_importer as nvd_importer_v2
 from vulnerabilities.pipelines.v2_importers import pypa_importer as pypa_importer_v2
 from vulnerabilities.pipelines.v2_importers import pysec_importer as pysec_importer_v2
-from vulnerabilities.pipelines.v2_importers import gitlab_importer as gitlab_importer_v2
 from vulnerabilities.pipelines.v2_importers import vulnrichment_importer as vulnrichment_importer_v2
 
 IMPORTERS_REGISTRY = [

vulnerabilities/pipelines/v2_importers/pysec_importer.py

@@ -15,7 +15,8 @@
 import requests
 
 from vulnerabilities.importer import AdvisoryData
-from vulnerabilities.pipelines import VulnerableCodeBaseImporterPipeline, VulnerableCodeBaseImporterPipelineV2
+from vulnerabilities.pipelines import VulnerableCodeBaseImporterPipeline
+from vulnerabilities.pipelines import VulnerableCodeBaseImporterPipelineV2
 
 
 class PyPIImporterPipeline(VulnerableCodeBaseImporterPipelineV2):

vulnerabilities/tests/test_data/nginx/security_advisories-importer-expected.json

@@ -971,39 +971,6 @@
     "date_published": null,
     "weaknesses": []
   },
-  {
-    "unique_content_id": "8f54462a45ac49635f660b6fb755d5e05cdbc34ebaa565e38ca20c522579ce7f",
-    "summary": "Vulnerabilities with Windows 8.3 filename pseudonyms",
-    "affected_packages": [
-      {
-        "package": {
-          "name": "nginx",
-          "type": "nginx",
-          "subpath": "",
-          "version": "",
-          "namespace": "",
-          "qualifiers": "os=windows"
-        },
-        "fixed_version": "0.8.33",
-        "affected_version_range": "vers:nginx/>=0.7.52|<=0.8.32"
-      },
-      {
-        "package": {
-          "name": "nginx",
-          "type": "nginx",
-          "subpath": "",
-          "version": "",
-          "namespace": "",
-          "qualifiers": "os=windows"
-        },
-        "fixed_version": "0.7.65",
-        "affected_version_range": "vers:nginx/>=0.7.52|<=0.8.32"
-      }
-    ],
-    "references": [],
-    "date_published": null,
-    "weaknesses": []
-  },
   {
     "unique_content_id": "92ce767b8cea36271d33c119cb6f706f64f5aba7335cca6791eca90a87f48de1",
     "summary": "Vulnerabilities with Windows file default stream",
@@ -1536,6 +1503,39 @@
     "date_published": null,
     "weaknesses": []
   },
+  {
+    "unique_content_id": "cd771d4c853d0a5fd6bbc62866fe638c0b41f21f600889447bbaf3b6cd4bad7b",
+    "summary": "Vulnerabilities with Windows 8.3 filename pseudonyms",
+    "affected_packages": [
+      {
+        "package": {
+          "name": "nginx",
+          "type": "nginx",
+          "subpath": "",
+          "version": "",
+          "namespace": "",
+          "qualifiers": "os=windows"
+        },
+        "fixed_version": "0.8.33",
+        "affected_version_range": "vers:nginx/>=0.7.52|<=0.8.32"
+      },
+      {
+        "package": {
+          "name": "nginx",
+          "type": "nginx",
+          "subpath": "",
+          "version": "",
+          "namespace": "",
+          "qualifiers": "os=windows"
+        },
+        "fixed_version": "0.7.65",
+        "affected_version_range": "vers:nginx/>=0.7.52|<=0.8.32"
+      }
+    ],
+    "references": [],
+    "date_published": null,
+    "weaknesses": []
+  },
   {
     "unique_content_id": "de7a819f87c93c708251b734406d2b9916fce494ab3987be40ca37426b0c2044",
     "summary": "Buffer underflow vulnerability",

vulnerabilities/tests/test_data/openssl/security_advisories-importer-expected.json

@@ -3614,7 +3614,7 @@
     "weaknesses": []
   },
   {
-    "unique_content_id": "4ee23c143c0a01cd7035e1646adaf2222725ad2c96447ffc524eb79d1ac532dd",
+    "unique_content_id": "c160af01903483f7380e4bbecd41bc2346069c1c931eb2be9cc45643daf51937",
     "summary": "OpenSSL has added support for TLS_FALLBACK_SCSV to allow applications to block the ability for a MITM attacker to force a protocol downgrade. Some client applications (such as browsers) will reconnect using a downgraded protocol to work around interoperability bugs in older servers. This could be exploited by an active man-in-the-middle to downgrade connections to SSL 3.0 even if both sides of the connection support higher protocols. SSL 3.0 contains a number of weaknesses including POODLE (CVE-2014-3566). See also https://tools.ietf.org/html/draft-ietf-tls-downgrade-scsv-00 and https://www.openssl.org/~bodo/ssl-poodle.pdf",
     "affected_packages": [
       {