feat: change EXTERNAL_SYSTEM() to give a boolean (#2417)

Author: b31ngd3v

test/test_available_fix.py

@@ -17,7 +17,7 @@ def arrange_data(self):
         check_json()
 
     @pytest.mark.skipif(
-        EXTERNAL_SYSTEM() != 1, reason="Skipping tests to reduce network calls"
+        not EXTERNAL_SYSTEM(), reason="Skipping tests to reduce network calls"
     )
     def test_long_debian_backport_fix_output(
         self, caplog: pytest.LogCaptureFixture
@@ -52,7 +52,7 @@ def test_debian_backport_fix_output(
         assert expected_output == [rec.message for rec in caplog.records]
 
     @pytest.mark.skipif(
-        EXTERNAL_SYSTEM() != 1, reason="Skipping tests to reduce network calls"
+        not EXTERNAL_SYSTEM(), reason="Skipping tests to reduce network calls"
     )
     def test_long_debian_available_fix_output(
         self, caplog: pytest.LogCaptureFixture
@@ -91,7 +91,7 @@ def test_debian_available_fix_output(
         assert expected_output == [rec.message for rec in caplog.records]
 
     @pytest.mark.skipif(
-        EXTERNAL_SYSTEM() != 1, reason="Skipping tests to reduce network calls"
+        not EXTERNAL_SYSTEM(), reason="Skipping tests to reduce network calls"
     )
     def test_long_redhat_available_fix_output(
         self, caplog: pytest.LogCaptureFixture

test/test_cvedb.py

@@ -27,7 +27,7 @@ def teardown_class(cls):
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(
-        EXTERNAL_SYSTEM() != 1, reason="Skipping NVD calls due to rate limits"
+        not EXTERNAL_SYSTEM(), reason="Skipping NVD calls due to rate limits"
     )
     @pytest.mark.skipif(
         sys.platform == "win32", reason="Causing failures in CI on windows only"

test/test_nvd_api.py

@@ -25,7 +25,7 @@ def teardown_class(cls):
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(
-        EXTERNAL_SYSTEM() != 1 or not os.getenv("nvd_api_key"),
+        not EXTERNAL_SYSTEM() or not os.getenv("nvd_api_key"),
         reason="NVD tests run only when EXTERNAL_SYSTEM=1",
     )
     async def test_get_nvd_params(self):
@@ -39,7 +39,7 @@ async def test_get_nvd_params(self):
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(
-        EXTERNAL_SYSTEM() != 1 or not os.getenv("nvd_api_key"),
+        not EXTERNAL_SYSTEM() or not os.getenv("nvd_api_key"),
         reason="NVD tests run only when EXTERNAL_SYSTEM=1",
     )
     async def test_total_results_count(self):
@@ -53,7 +53,7 @@ async def test_total_results_count(self):
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(
-        EXTERNAL_SYSTEM() != 1 or not os.getenv("nvd_api_key"),
+        not EXTERNAL_SYSTEM() or not os.getenv("nvd_api_key"),
         reason="NVD tests run only when EXTERNAL_SYSTEM=1",
     )
     async def test_nvd_incremental_update(self):
@@ -75,7 +75,7 @@ async def test_nvd_incremental_update(self):
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(
-        EXTERNAL_SYSTEM() != 1 or not os.getenv("nvd_api_key"),
+        not EXTERNAL_SYSTEM() or not os.getenv("nvd_api_key"),
         reason="NVD tests run only when EXTERNAL_SYSTEM=1",
     )
     async def test_empty_nvd_result(self):

test/test_source_gad.py

@@ -152,7 +152,7 @@ def teardown_class(cls):
     }
 
     @pytest.mark.asyncio
-    @pytest.mark.skipif(EXTERNAL_SYSTEM() != 1, reason="Needs network connection.")
+    @pytest.mark.skipif(not EXTERNAL_SYSTEM(), reason="Needs network connection.")
     async def test_update_slugs(self):
         connector = aiohttp.TCPConnector(limit_per_host=19)
         async with aiohttp.ClientSession(
@@ -163,7 +163,7 @@ async def test_update_slugs(self):
         assert all(x in self.gad.slugs for x in self.slugs)
 
     @pytest.mark.asyncio
-    @pytest.mark.skipif(EXTERNAL_SYSTEM() != 1, reason="Needs network connection.")
+    @pytest.mark.skipif(not EXTERNAL_SYSTEM(), reason="Needs network connection.")
     async def test_get_slug_00(self):
         slug_url = f"{self.gad.gad_url}?path=conan/cairo"
 
@@ -178,7 +178,7 @@ async def test_get_slug_00(self):
         assert ("CVE-2020-35492.yml" in x for x in z.namelist())
 
     @pytest.mark.asyncio
-    @pytest.mark.skipif(EXTERNAL_SYSTEM() != 1, reason="Needs network connection.")
+    @pytest.mark.skipif(not EXTERNAL_SYSTEM(), reason="Needs network connection.")
     async def test_get_slug_01(self):
         slug_url = f"{self.gad.gad_compare_url}?from=aa3c4bf5605855aff8c26363a24bff6da45d4812&to=a0979afc34fc6692ae8e48b3d7604e27062add62"
 

test/test_source_nvd.py

@@ -23,7 +23,7 @@ def teardown_class(cls):
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(
-        EXTERNAL_SYSTEM() != 1, reason="Skipping NVD calls due to rate limits"
+        not EXTERNAL_SYSTEM(), reason="Skipping NVD calls due to rate limits"
     )
     async def test_00_getmeta(self):
         connector = aiohttp.TCPConnector(limit_per_host=19)
@@ -38,7 +38,7 @@ async def test_00_getmeta(self):
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(
-        EXTERNAL_SYSTEM() != 1, reason="Skipping NVD calls due to rate limits"
+        not EXTERNAL_SYSTEM(), reason="Skipping NVD calls due to rate limits"
     )
     async def test_01_cache_update(self):
         async with aiohttp.ClientSession(trust_env=True) as session:

test/test_source_osv.py

@@ -183,14 +183,14 @@ def teardown_class(cls):
     }
 
     @pytest.mark.asyncio
-    @pytest.mark.skipif(EXTERNAL_SYSTEM() != 1, reason="Needs network connection.")
+    @pytest.mark.skipif(not EXTERNAL_SYSTEM(), reason="Needs network connection.")
     async def test_update_ecosystems(self):
         await self.osv.update_ecosystems()
 
         assert all(x in self.osv.ecosystems for x in self.ecosystems)
 
     @pytest.mark.asyncio
-    @pytest.mark.skipif(EXTERNAL_SYSTEM() != 1, reason="Needs network connection.")
+    @pytest.mark.skipif(not EXTERNAL_SYSTEM(), reason="Needs network connection.")
     @pytest.mark.parametrize("ecosystem_url", [url for url in cve_file_data])
     async def test_get_ecosystem_00(self, ecosystem_url):
         connector = aiohttp.TCPConnector(limit_per_host=19)
@@ -205,7 +205,7 @@ async def test_get_ecosystem_00(self, ecosystem_url):
         assert content["published"] == cve_data["published"]
 
     @pytest.mark.asyncio
-    @pytest.mark.skipif(EXTERNAL_SYSTEM() != 1, reason="Needs network connection.")
+    @pytest.mark.skipif(not EXTERNAL_SYSTEM(), reason="Needs network connection.")
     async def test_get_ecosystem_01(self):
         eco_url = f"{self.osv_url}DWF/all.zip"
 
@@ -221,7 +221,7 @@ async def test_get_ecosystem_01(self):
         assert len(z.namelist()) == 0
 
     @pytest.mark.asyncio
-    @pytest.mark.skipif(EXTERNAL_SYSTEM() != 1, reason="Needs network connection.")
+    @pytest.mark.skipif(not EXTERNAL_SYSTEM(), reason="Needs network connection.")
     async def test_fetch_cves(self):
         self.osv.ecosystems = ["PyPI"]
 

test/utils.py

@@ -58,12 +58,11 @@ def LONG_TESTS():
     return LONG_TESTS
 
 
-def EXTERNAL_SYSTEM():
-    EXTERNAL_SYSTEM = 0
-    # override EXTERNAL_SYSTEM with environment variable if available
-    if os.getenv("EXTERNAL_SYSTEM"):
-        EXTERNAL_SYSTEM = int(os.getenv("EXTERNAL_SYSTEM"))
-    return EXTERNAL_SYSTEM
+def EXTERNAL_SYSTEM() -> bool:
+    env_var = os.getenv("EXTERNAL_SYSTEM")
+    if env_var:
+        return bool(int(env_var))
+    return False
 
 
 @pytest.fixture