Move flaky remote tests into "scheduled" workflow.

10 files changed, 34 insertions, 35 deletions

diff --git a/tests/cc/test_cc_dataset.py b/tests/cc/test_cc_dataset.py
index cba06a64..127f4e5b 100644
--- a/tests/cc/test_cc_dataset.py
+++ b/tests/cc/test_cc_dataset.py
@@ -77,13 +77,13 @@ def test_download_and_convert_pdfs(toy_dataset: CCDataset, data_dir: Path):
         )
 
 
-@pytest.mark.slow
-@pytest.mark.xfail(reason="May fail due to network issues.")
+@pytest.mark.remote
 def test_from_web():
     dset = CCDataset.from_web()
     assert len(dset) > 6000
 
 
+@pytest.mark.remote
 def test_archive_fits():
     fsize = helpers.query_file_size(config.cc_latest_full_archive)
     tmpdir = helpers.tempdir_for(fsize)
diff --git a/tests/cc/test_cc_maintenance_updates.py b/tests/cc/test_cc_maintenance_updates.py
index 683c8644..dd470aa3 100644
--- a/tests/cc/test_cc_maintenance_updates.py
+++ b/tests/cc/test_cc_maintenance_updates.py
@@ -77,8 +77,7 @@ def test_to_pandas(mu_dset: CCDatasetMaintenanceUpdates):
     assert set(df.columns) == set(CCMaintenanceUpdate.pandas_columns) - {"dgst"}
 
 
-@pytest.mark.slow
-@pytest.mark.xfail(reason="May fail due to network issues.")
+@pytest.mark.remote
 def test_from_web():
     dset = CCDatasetMaintenanceUpdates.from_web()
     assert dset is not None
diff --git a/tests/cc/test_cc_protection_profiles.py b/tests/cc/test_cc_protection_profiles.py
index 4cf61fd0..4f1bdee7 100644
--- a/tests/cc/test_cc_protection_profiles.py
+++ b/tests/cc/test_cc_protection_profiles.py
@@ -71,14 +71,13 @@ def test_get_certs_from_web(pp_data_dir: Path, toy_pp_dataset: ProtectionProfile
         assert isinstance(cert.web_data.version, str)
 
 
-@pytest.mark.slow
-@pytest.mark.xfail(reason="May fail due to network issues.")
+@pytest.mark.remote
 def test_from_web():
     dset = ProtectionProfileDataset.from_web()
     assert len(dset) > 400
 
 
-@pytest.mark.xfail(reason="May fail due to error on CC server")
+@pytest.mark.remote
 def test_download_html_files():
     with TemporaryDirectory() as tmp_dir:
         dset = ProtectionProfileDataset(root_dir=Path(tmp_dir))
diff --git a/tests/cc/test_cc_schemes.py b/tests/cc/test_cc_schemes.py
index 68599bc5..e14ebf6f 100644
--- a/tests/cc/test_cc_schemes.py
+++ b/tests/cc/test_cc_schemes.py
@@ -2,7 +2,6 @@ from datetime import date
 from urllib.parse import urlparse
 
 import pytest
-from requests import RequestException
 
 import sec_certs.sample.cc_scheme as CCSchemes
 from sec_certs.dataset.auxiliary_dataset_handling import CCSchemeDatasetHandler
@@ -21,7 +20,7 @@ def absolute_urls(results):
     return True
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_australia():
     ineval = CCSchemes.get_australia_in_evaluation()
     assert len(ineval) != 0
@@ -33,7 +32,7 @@ def canada_certified():
     return CCSchemes.get_canada_certified()
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 @pytest.mark.slow
 def test_canada(canada_certified):
     assert len(canada_certified) != 0
@@ -43,7 +42,7 @@ def test_canada(canada_certified):
     assert absolute_urls(ineval)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 @pytest.mark.slow
 def test_anssi():
     certified = CCSchemes.get_france_certified()
@@ -54,7 +53,7 @@ def test_anssi():
     assert absolute_urls(archived)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 @pytest.mark.slow
 def test_bsi():
     certified = CCSchemes.get_germany_certified()
@@ -62,7 +61,7 @@ def test_bsi():
     assert absolute_urls(certified)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_india():
     certified = CCSchemes.get_india_certified()
     assert len(certified) != 0
@@ -72,7 +71,7 @@ def test_india():
     assert absolute_urls(archived)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_italy():
     certified = CCSchemes.get_italy_certified()
     assert len(certified) != 0
@@ -82,7 +81,7 @@ def test_italy():
     assert absolute_urls(ineval)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_japan():
     certified = CCSchemes.get_japan_certified()
     assert len(certified) != 0
@@ -95,7 +94,7 @@ def test_japan():
     assert absolute_urls(ineval)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_malaysia():
     certified = CCSchemes.get_malaysia_certified()
     assert len(certified) != 0
@@ -108,7 +107,7 @@ def test_malaysia():
     assert absolute_urls(ineval)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_netherlands():
     certified = CCSchemes.get_netherlands_certified()
     assert len(certified) != 0
@@ -118,7 +117,7 @@ def test_netherlands():
     assert absolute_urls(ineval)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_norway():
     certified = CCSchemes.get_norway_certified()
     assert len(certified) != 0
@@ -128,7 +127,7 @@ def test_norway():
     assert absolute_urls(archived)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_korea():
     certified = CCSchemes.get_korea_certified()
     assert len(certified) != 0
@@ -138,7 +137,7 @@ def test_korea():
     assert absolute_urls(archived)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_poland():
     certified = CCSchemes.get_poland_certified()
     assert len(certified) != 0
@@ -148,7 +147,7 @@ def test_poland():
     assert absolute_urls(ineval)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_singapore():
     certified = CCSchemes.get_singapore_certified()
     assert len(certified) != 0
@@ -161,14 +160,14 @@ def test_singapore():
     assert absolute_urls(ineval)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_spain():
     certified = CCSchemes.get_spain_certified()
     assert len(certified) != 0
     assert absolute_urls(certified)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_sweden():
     certified = CCSchemes.get_sweden_certified()
     assert len(certified) != 0
@@ -181,14 +180,14 @@ def test_sweden():
     assert absolute_urls(ineval)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_turkey():
     certified = CCSchemes.get_turkey_certified()
     assert len(certified) != 0
     assert absolute_urls(certified)
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_usa():
     certified = CCSchemes.get_usa_certified()
     assert len(certified) != 0
@@ -225,6 +224,7 @@ def test_single_match(cert_one: CCCertificate):
     assert matcher.match(cert_one) > 95
 
 
+@pytest.mark.remote
 def test_matching(toy_dataset: CCDataset, canada_certified):
     matches, scores = CCSchemeMatcher.match_all(canada_certified, "CA", toy_dataset)
     assert len(matches) == 1
diff --git a/tests/fips/test_fips_dataset.py b/tests/fips/test_fips_dataset.py
index a375cbd3..34746842 100644
--- a/tests/fips/test_fips_dataset.py
+++ b/tests/fips/test_fips_dataset.py
@@ -37,12 +37,13 @@ def test_dataset_to_json(toy_dataset: FIPSDataset, data_dir: Path, tmp_path: Pat
     assert data == template_data
 
 
-@pytest.mark.slow
+@pytest.mark.remote
 def test_from_web():
     dset = FIPSDataset.from_web()
     assert len(dset) > 4000
 
 
+@pytest.mark.remote
 def test_archive_fits():
     fsize = helpers.query_file_size(config.fips_latest_full_archive)
     tmpdir = helpers.tempdir_for(fsize)
diff --git a/tests/fips/test_fips_iut.py b/tests/fips/test_fips_iut.py
index 17d15dc8..ede3d13c 100644
--- a/tests/fips/test_fips_iut.py
+++ b/tests/fips/test_fips_iut.py
@@ -7,7 +7,6 @@ from pathlib import Path
 
 import pytest
 import tests.data.fips.iut
-from requests import RequestException
 
 from sec_certs.configuration import config
 from sec_certs.dataset.fips import FIPSDataset
@@ -33,7 +32,7 @@ def test_iut_dataset_from_dumps(data_dir: Path):
     assert len(dset) == 2
 
 
-@pytest.mark.xfail(reason="May fail due to network issues.")
+@pytest.mark.remote
 def test_iut_dataset_from_web():
     assert IUTDataset.from_web()
 
@@ -43,12 +42,13 @@ def test_iut_snapshot_from_dump(data_dump_path: Path):
 
 
 @pytest.mark.parametrize("preferred_source", ["origin", "sec-certs"])
+@pytest.mark.remote
 def test_iut_snapshot_from_web(preferred_source):
     config.preferred_source_remote_datasets = preferred_source
     assert IUTSnapshot.from_web()
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_from_nist():
     assert IUTSnapshot.from_nist_web()
 
diff --git a/tests/fips/test_fips_mip.py b/tests/fips/test_fips_mip.py
index b8ac805f..58a11de0 100644
--- a/tests/fips/test_fips_mip.py
+++ b/tests/fips/test_fips_mip.py
@@ -7,7 +7,6 @@ from pathlib import Path
 
 import pytest
 import tests.data.fips.mip
-from requests import RequestException
 
 from sec_certs.configuration import config
 from sec_certs.dataset.fips import FIPSDataset
@@ -33,7 +32,7 @@ def test_mip_dataset_from_dumps(data_dir: Path):
     assert len(dset) == 3
 
 
-@pytest.mark.xfail(reason="May fail due to network issues.")
+@pytest.mark.remote
 def test_mip_flows():
     dset = MIPDataset.from_web()
     assert dset.compute_flows()
@@ -44,12 +43,13 @@ def test_mip_snapshot_from_dump(data_dump_path: Path):
 
 
 @pytest.mark.parametrize("preferred_source", ["sec-certs", "origin"])
+@pytest.mark.remote
 def test_from_web(preferred_source):
     config.preferred_source_remote_datasets = preferred_source
     assert MIPSnapshot.from_web()
 
 
-@pytest.mark.xfail(reason="May fail due to server errors.", raises=RequestException)
+@pytest.mark.remote
 def test_from_nist():
     assert MIPSnapshot.from_nist_web()
 
diff --git a/tests/test_cpe.py b/tests/test_cpe.py
index 637b2cb0..7b24ae59 100644
--- a/tests/test_cpe.py
+++ b/tests/test_cpe.py
@@ -72,7 +72,7 @@ def test_serialization_missing_path():
         dummy_dset.to_json()
 
 
-@pytest.mark.skip(reason="Uses too much bandwidth.")
+@pytest.mark.remote
 def test_cpe_download_from_seccerts():
     cpe_dataset = CPEDataset.from_web()
     assert len(cpe_dataset) > 100000
diff --git a/tests/test_cve.py b/tests/test_cve.py
index 8fb31dde..dcbdda8b 100644
--- a/tests/test_cve.py
+++ b/tests/test_cve.py
@@ -99,7 +99,7 @@ def test_criteria_configuration_expansion(cve_dataset_path: Path, cpe_match_feed
     ]
 
 
-@pytest.mark.skip(reason="Uses too much bandwidth.")
+@pytest.mark.remote
 def test_cve_download_from_seccerts():
     cve_dataset = CVEDataset.from_web()
     assert len(cve_dataset) > 100000
diff --git a/tests/test_nvd_dataset_builder.py b/tests/test_nvd_dataset_builder.py
index ad293604..599e0a28 100644
--- a/tests/test_nvd_dataset_builder.py
+++ b/tests/test_nvd_dataset_builder.py
@@ -20,7 +20,7 @@ def load_test_config():
         config.load_from_yaml(path)
 
 
-@pytest.mark.xfail(reason="May fail due to NVD server errors.")
+@pytest.mark.remote
 @pytest.mark.parametrize(
     "default_dataset, builder_class",
     [