feat: Change LONG_TESTS() to give a boolean (#2411)

Co-authored-by: Dmitry Volodin <[email protected]>
Co-authored-by: Terri Oda <[email protected]>

Author: 3 people

test/test_cli.py

@@ -32,17 +32,17 @@ class TestCLI(TempDirTest):
 
     TEST_PATH = Path(__file__).parent.resolve()
 
-    @pytest.mark.skipif(LONG_TESTS() != 1, reason="No file downloads in short tests")
+    @pytest.mark.skipif(not LONG_TESTS(), reason="No file downloads in short tests")
     def setup_method(self):
         shutil.copyfile(DEB_FILE_PATH, Path(self.tempdir) / "test.deb")
         download_file(CURL_7_20_0_URL, Path(self.tempdir) / CURL_7_20_0_RPM)
 
-    @pytest.mark.skipif(LONG_TESTS() != 1, reason="No file downloads in short tests")
+    @pytest.mark.skipif(not LONG_TESTS(), reason="No file downloads in short tests")
     def test_extract_curl_7_20_0(self):
         """Scanning curl-7.20.0"""
         assert main(["cve-bin-tool", "-l", "debug", "-x", self.tempdir]) != 0
 
-    @pytest.mark.skipif(LONG_TESTS() != 1, reason="No file downloads in short tests")
+    @pytest.mark.skipif(not LONG_TESTS(), reason="No file downloads in short tests")
     def test_binary_curl_7_20_0(self):
         """Extracting from rpm and scanning curl-7.20.0"""
         with Extractor() as ectx:
@@ -59,7 +59,7 @@ def test_binary_curl_7_20_0(self):
                 != 0
             )
 
-    @pytest.mark.skipif(LONG_TESTS() != 1, reason="No file downloads in short tests")
+    @pytest.mark.skipif(not LONG_TESTS(), reason="No file downloads in short tests")
     def test_no_extraction(self):
         """Test scanner against curl-7.20.0 rpm with extraction turned off"""
         assert main(["cve-bin-tool", str(Path(self.tempdir) / CURL_7_20_0_RPM)]) != 0
@@ -80,7 +80,7 @@ def test_extract_bad_zip_messages(self, caplog):
             main(["cve-bin-tool", bad_zip_file])
         assert "Failure extracting" in caplog.text
 
-    @pytest.mark.skipif(LONG_TESTS() != 1, reason="No file downloads in short tests")
+    @pytest.mark.skipif(not LONG_TESTS(), reason="No file downloads in short tests")
     def test_exclude(self, caplog):
         """Test that the exclude paths are not scanned"""
         test_path = Path(__file__).parent.resolve()
@@ -153,7 +153,7 @@ def test_invalid_parameter(self):
             main(["cve-bin-tool", self.tempdir, "--bad-param;cat hi"])
         assert e.value.args[0] == ERROR_CODES[SystemExit]
 
-    @pytest.mark.skipif(LONG_TESTS() != 1, reason="Update flag tests are long tests")
+    @pytest.mark.skipif(not LONG_TESTS(), reason="Update flag tests are long tests")
     @pytest.mark.skipif(
         sys.platform == "win32", reason="Causing failures in CI on windows only"
     )
@@ -234,7 +234,7 @@ def test_runs(self, caplog):
             main(["cve-bin-tool", test_path, "-r", ",".join(runs)])
         self.check_checkers_log(caplog, skip_checkers, runs)
 
-    @pytest.mark.skipif(LONG_TESTS() != 1, reason="Update flag tests are long tests")
+    @pytest.mark.skipif(not LONG_TESTS(), reason="Update flag tests are long tests")
     @pytest.mark.skipif(
         sys.platform == "win32", reason="Causing failures in CI on windows only"
     )
@@ -530,7 +530,7 @@ def test_SBOM(self, caplog):
             "There are 1 products with known CVEs detected",
         ) in caplog.record_tuples
 
-    @pytest.mark.skipif(LONG_TESTS() != 1, reason="Skipping long tests")
+    @pytest.mark.skipif(not LONG_TESTS(), reason="Skipping long tests")
     def test_console_output_depending_reportlab_existence(self, caplog):
         import subprocess
         from importlib.machinery import ModuleSpec

test/test_json.py

@@ -9,7 +9,6 @@
 import datetime
 import gzip
 import json
-import unittest
 from pathlib import Path
 from test.utils import LONG_TESTS
 
@@ -30,7 +29,7 @@ class TestJSON:
     SCHEMA = requests.get(NVD_SCHEMA).json()
     LOGGER.info("Schema loaded successfully")
 
-    @unittest.skipUnless(LONG_TESTS() > 0, "Skipping long tests")
+    @pytest.mark.skipif(not LONG_TESTS(), reason="Skipping long tests")
     @pytest.mark.parametrize(
         "year", list(range(2002, datetime.datetime.now().year + 1))
     )

test/test_scanner.py

@@ -241,7 +241,7 @@ def condensed_filepath(self, url, package_name):
             for d in list_data
         ),
     )
-    @unittest.skipUnless(LONG_TESTS() > 0, "Skipping long tests")
+    @pytest.mark.skipif(not LONG_TESTS, reason="Skipping long tests")
     def test_version_in_package(self, url, package_name, product, version):
         """Helper function to get a file (presumed to be a real copy
         of a library, probably from a Linux distribution) and run a
@@ -267,7 +267,7 @@ def test_version_in_package(self, url, package_name, product, version):
         The checker signature or url may be incorrect."""
         assert version in list_versions
 
-    @pytest.mark.skipif(LONG_TESTS() != 1, reason="Skipping long tests")
+    @pytest.mark.skipif(not LONG_TESTS(), reason="Skipping long tests")
     @pytest.mark.skip(
         reason="Broken. See https://github.com/intel/cve-bin-tool/issues/2054"
     )

test/utils.py

@@ -50,12 +50,12 @@ def download_file(url, target):
     download.close()
 
 
-def LONG_TESTS():
-    LONG_TESTS = 0
+def LONG_TESTS() -> bool:
     # override LONG_TESTS with environment variable if available
-    if os.getenv("LONG_TESTS"):
-        LONG_TESTS = int(os.getenv("LONG_TESTS"))
-    return LONG_TESTS
+    env_var = os.getenv("LONG_TESTS")
+    if env_var:
+        return bool(int(env_var))
+    return False
 
 
 def EXTERNAL_SYSTEM() -> bool: