aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorAdam Janovsky2023-11-14 14:25:05 +0100
committerAdam Janovsky2023-11-14 14:25:05 +0100
commit76219404a0b70bebf1778cf237bb84427b92bc45 (patch)
tree0a95d2eda641f9bb8bdd8da9e86e7c836a645efa /tests
parent0f35424e75ff56597c00e638b6b615d01f2fe080 (diff)
downloadsec-certs-76219404a0b70bebf1778cf237bb84427b92bc45.tar.gz
sec-certs-76219404a0b70bebf1778cf237bb84427b92bc45.tar.zst
sec-certs-76219404a0b70bebf1778cf237bb84427b92bc45.zip
bump required python to 3.8
Diffstat (limited to 'tests')
-rw-r--r--tests/cc/conftest.py2
-rw-r--r--tests/cc/test_cc_analysis.py2
-rw-r--r--tests/cc/test_cc_certificate.py2
-rw-r--r--tests/cc/test_cc_maintenance_updates.py2
-rw-r--r--tests/conftest.py2
-rw-r--r--tests/fips/test_fips_certificate.py2
-rw-r--r--tests/fips/test_fips_dataset.py2
-rw-r--r--tests/fips/test_fips_iut.py2
-rw-r--r--tests/fips/test_fips_mip.py2
-rw-r--r--tests/test_nvd_dataset_builder.py8
10 files changed, 13 insertions, 13 deletions
diff --git a/tests/cc/conftest.py b/tests/cc/conftest.py
index ad60037c..1f5050be 100644
--- a/tests/cc/conftest.py
+++ b/tests/cc/conftest.py
@@ -1,7 +1,7 @@
+from collections.abc import Generator
from datetime import date
from importlib import resources
from pathlib import Path
-from typing import Generator
import pytest
import tests.data.cc.dataset
diff --git a/tests/cc/test_cc_analysis.py b/tests/cc/test_cc_analysis.py
index 0b0edf7e..3984a72e 100644
--- a/tests/cc/test_cc_analysis.py
+++ b/tests/cc/test_cc_analysis.py
@@ -1,9 +1,9 @@
from __future__ import annotations
import shutil
+from collections.abc import Generator
from importlib import resources
from pathlib import Path
-from typing import Generator
import pytest
import tests.data.cc.analysis
diff --git a/tests/cc/test_cc_certificate.py b/tests/cc/test_cc_certificate.py
index 772d859c..bdc10f32 100644
--- a/tests/cc/test_cc_certificate.py
+++ b/tests/cc/test_cc_certificate.py
@@ -1,8 +1,8 @@
import json
import shutil
+from collections.abc import Generator
from importlib import resources
from pathlib import Path
-from typing import Generator
import pytest
import tests.data.cc.analysis
diff --git a/tests/cc/test_cc_maintenance_updates.py b/tests/cc/test_cc_maintenance_updates.py
index c89c9164..1144d3e0 100644
--- a/tests/cc/test_cc_maintenance_updates.py
+++ b/tests/cc/test_cc_maintenance_updates.py
@@ -1,7 +1,7 @@
import json
+from collections.abc import Generator
from importlib import resources
from pathlib import Path
-from typing import Generator
import pytest
import tests.data.cc.dataset
diff --git a/tests/conftest.py b/tests/conftest.py
index 1d8e2a09..ad1b45d2 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,7 +1,7 @@
import json
+from collections.abc import Generator
from importlib import resources
from pathlib import Path
-from typing import Generator
import pytest
diff --git a/tests/fips/test_fips_certificate.py b/tests/fips/test_fips_certificate.py
index 498c2328..8b326365 100644
--- a/tests/fips/test_fips_certificate.py
+++ b/tests/fips/test_fips_certificate.py
@@ -2,9 +2,9 @@ from __future__ import annotations
import json
import shutil
+from collections.abc import Generator
from importlib import resources
from pathlib import Path
-from typing import Generator
import pytest
import tests.data.fips.certificate
diff --git a/tests/fips/test_fips_dataset.py b/tests/fips/test_fips_dataset.py
index 43c4fdbd..9b18b754 100644
--- a/tests/fips/test_fips_dataset.py
+++ b/tests/fips/test_fips_dataset.py
@@ -2,10 +2,10 @@ from __future__ import annotations
import json
import shutil
+from collections.abc import Generator
from importlib import resources
from pathlib import Path
from tempfile import TemporaryDirectory
-from typing import Generator
import pytest
import tests.data.fips.dataset
diff --git a/tests/fips/test_fips_iut.py b/tests/fips/test_fips_iut.py
index cef0b758..e3bfbc1c 100644
--- a/tests/fips/test_fips_iut.py
+++ b/tests/fips/test_fips_iut.py
@@ -1,9 +1,9 @@
from __future__ import annotations
import datetime
+from collections.abc import Generator
from importlib import resources
from pathlib import Path
-from typing import Generator
import pytest
import tests.data.fips.iut
diff --git a/tests/fips/test_fips_mip.py b/tests/fips/test_fips_mip.py
index db3e7d8c..1f2d2d2f 100644
--- a/tests/fips/test_fips_mip.py
+++ b/tests/fips/test_fips_mip.py
@@ -1,9 +1,9 @@
from __future__ import annotations
import datetime
+from collections.abc import Generator
from importlib import resources
from pathlib import Path
-from typing import Generator
import pytest
import tests.data.fips.mip
diff --git a/tests/test_nvd_dataset_builder.py b/tests/test_nvd_dataset_builder.py
index bc69cc3c..4868bfa7 100644
--- a/tests/test_nvd_dataset_builder.py
+++ b/tests/test_nvd_dataset_builder.py
@@ -1,6 +1,6 @@
from datetime import date, datetime, timedelta
from importlib import resources
-from typing import Any, Type
+from typing import Any
import pytest
@@ -50,14 +50,14 @@ def test_cpe_match_download_from_seccerts():
({"timestamp": datetime.fromtimestamp(0).isoformat(), "match_strings": {}}, CpeMatchNvdDatasetBuilder),
],
)
-def test_build_dataset(default_dataset: Any, builder_class: Type[NvdDatasetBuilder]):
+def test_build_dataset(default_dataset: Any, builder_class: type[NvdDatasetBuilder]):
def get_update_timestamp_from_dataset(dset) -> datetime:
- if isinstance(dset, (CPEDataset, CVEDataset)):
+ if isinstance(dset, CPEDataset | CVEDataset):
return dset.last_update_timestamp
return datetime.fromisoformat(dset["timestamp"])
def get_dataset_len(dset) -> int:
- if isinstance(dset, (CPEDataset, CVEDataset)):
+ if isinstance(dset, CPEDataset | CVEDataset):
return len(dset)
return len(dset["match_strings"])