aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJán Jančár2025-06-12 12:22:34 +0000
committerJán Jančár2025-06-12 12:22:34 +0000
commit5eff9cfd80a72d1835cab288b572d6a1abdd9b23 (patch)
tree9de3c3af26c6ba25f98adad0d2e2bd8f27c612b8
parent93e6be7e619f692625ba4c4f4a0a1bf75f2e40d8 (diff)
downloadsec-certs-5eff9cfd80a72d1835cab288b572d6a1abdd9b23.tar.gz
sec-certs-5eff9cfd80a72d1835cab288b572d6a1abdd9b23.tar.zst
sec-certs-5eff9cfd80a72d1835cab288b572d6a1abdd9b23.zip
fix: Tests and dataset version
-rw-r--r--tests/cc/test_cc_dataset.py2
-rw-r--r--tests/cc/test_cc_maintenance_updates.py2
-rw-r--r--tests/cc/test_cc_protection_profiles.py2
-rw-r--r--tests/data/cc/dataset/auxiliary_datasets/maintenances/maintenance_updates.json3
-rw-r--r--tests/data/cc/dataset/toy_dataset.json3
-rw-r--r--tests/data/fips/dataset/toy_dataset.json3
-rw-r--r--tests/data/protection_profiles/dataset.json3
-rw-r--r--tests/fips/test_fips_dataset.py2
8 files changed, 16 insertions, 4 deletions
diff --git a/tests/cc/test_cc_dataset.py b/tests/cc/test_cc_dataset.py
index 127f4e5b..3d13edeb 100644
--- a/tests/cc/test_cc_dataset.py
+++ b/tests/cc/test_cc_dataset.py
@@ -101,6 +101,8 @@ def test_dataset_to_json(toy_dataset: CCDataset, data_dir: Path, tmp_path: Path)
del data["timestamp"]
del template_data["timestamp"]
+ del data["state"]["sec_certs_version"]
+ del template_data["state"]["sec_certs_version"]
assert data == template_data
diff --git a/tests/cc/test_cc_maintenance_updates.py b/tests/cc/test_cc_maintenance_updates.py
index dd470aa3..be010a25 100644
--- a/tests/cc/test_cc_maintenance_updates.py
+++ b/tests/cc/test_cc_maintenance_updates.py
@@ -61,6 +61,8 @@ def test_dataset_to_json(mu_dset: CCDatasetMaintenanceUpdates, data_dir: Path, t
del template_data["timestamp"]
del data["timestamp"]
+ del template_data["state"]["sec_certs_version"]
+ del data["state"]["sec_certs_version"]
assert data == template_data
diff --git a/tests/cc/test_cc_protection_profiles.py b/tests/cc/test_cc_protection_profiles.py
index 4f1bdee7..b7151a45 100644
--- a/tests/cc/test_cc_protection_profiles.py
+++ b/tests/cc/test_cc_protection_profiles.py
@@ -19,6 +19,8 @@ def test_dataset_from_json(toy_pp_dataset: ProtectionProfileDataset, pp_data_dir
del data["timestamp"]
del template_data["timestamp"]
+ del data["state"]["sec_certs_version"]
+ del template_data["state"]["sec_certs_version"]
assert data == template_data
diff --git a/tests/data/cc/dataset/auxiliary_datasets/maintenances/maintenance_updates.json b/tests/data/cc/dataset/auxiliary_datasets/maintenances/maintenance_updates.json
index d9430480..689ee354 100644
--- a/tests/data/cc/dataset/auxiliary_datasets/maintenances/maintenance_updates.json
+++ b/tests/data/cc/dataset/auxiliary_datasets/maintenances/maintenance_updates.json
@@ -6,7 +6,8 @@
"artifacts_downloaded": true,
"pdfs_converted": false,
"auxiliary_datasets_processed": false,
- "certs_analyzed": false
+ "certs_analyzed": false,
+ "sec_certs_version": "unknown"
},
"timestamp": "2022-11-10 13:44:35.171285",
"name": "maintenance_updates",
diff --git a/tests/data/cc/dataset/toy_dataset.json b/tests/data/cc/dataset/toy_dataset.json
index b6e071a4..51b44b43 100644
--- a/tests/data/cc/dataset/toy_dataset.json
+++ b/tests/data/cc/dataset/toy_dataset.json
@@ -6,7 +6,8 @@
"artifacts_downloaded": false,
"pdfs_converted": false,
"auxiliary_datasets_processed": false,
- "certs_analyzed": false
+ "certs_analyzed": false,
+ "sec_certs_version": "unknown"
},
"timestamp": "2020-11-16 17:04:14.770153",
"name": "toy dataset",
diff --git a/tests/data/fips/dataset/toy_dataset.json b/tests/data/fips/dataset/toy_dataset.json
index fb98ff34..d0fd323b 100644
--- a/tests/data/fips/dataset/toy_dataset.json
+++ b/tests/data/fips/dataset/toy_dataset.json
@@ -6,7 +6,8 @@
"artifacts_downloaded": true,
"pdfs_converted": true,
"auxiliary_datasets_processed": false,
- "certs_analyzed": false
+ "certs_analyzed": false,
+ "sec_certs_version": "unknown"
},
"timestamp": "2022-11-30 16:38:51.953055",
"name": "FIPSDataset dataset",
diff --git a/tests/data/protection_profiles/dataset.json b/tests/data/protection_profiles/dataset.json
index 6fb0b070..1d18b6f5 100644
--- a/tests/data/protection_profiles/dataset.json
+++ b/tests/data/protection_profiles/dataset.json
@@ -6,7 +6,8 @@
"artifacts_downloaded": false,
"pdfs_converted": false,
"auxiliary_datasets_processed": false,
- "certs_analyzed": false
+ "certs_analyzed": false,
+ "sec_certs_version": "unknown"
},
"timestamp": "2025-01-25 17:39:26.873380",
"name": "ProtectionProfileDataset dataset",
diff --git a/tests/fips/test_fips_dataset.py b/tests/fips/test_fips_dataset.py
index 34746842..37f14ca9 100644
--- a/tests/fips/test_fips_dataset.py
+++ b/tests/fips/test_fips_dataset.py
@@ -34,6 +34,8 @@ def test_dataset_to_json(toy_dataset: FIPSDataset, data_dir: Path, tmp_path: Pat
del data["timestamp"]
del template_data["timestamp"]
+ del data["state"]["secure_certs_version"]
+ del template_data["state"]["secure_certs_version"]
assert data == template_data