diff --git a/Makefile b/Makefile index 83506ddc..9386033b 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ publish: ## Publish the Python package to Pypi test: testpy testjs testpy: - pytest -vv umap/tests/ --dist=loadgroup + pytest -vv umap/tests/ --dist=loadgroup --reruns 1 test-integration: pytest -xv umap/tests/integration/ --dist=loadgroup diff --git a/pyproject.toml b/pyproject.toml index 9efc807c..177c5f0c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,6 +61,7 @@ test = [ "pytest==8.3.3", "pytest-django==4.9.0", "pytest-playwright==0.5.2", + "pytest-rerunfailures==14.0", "pytest-xdist>=3.5.0,<4", ] docker = [ diff --git a/umap/tests/integration/test_datalayer.py b/umap/tests/integration/test_datalayer.py index 9122e12b..ccb61121 100644 --- a/umap/tests/integration/test_datalayer.py +++ b/umap/tests/integration/test_datalayer.py @@ -55,10 +55,6 @@ def test_should_honour_fromZoom(live_server, map, datalayer, page): expect(markers).to_be_visible() -@pytest.mark.skipif( - os.environ.get("CI", "false") == "true", - reason="Test is failing intermittently, skipping in the CI", -) def test_should_honour_toZoom(live_server, map, datalayer, page): set_options(datalayer, displayOnLoad=True, toZoom=6) page.goto(f"{live_server.url}{map.get_absolute_url()}#7/48.55/14.68") diff --git a/umap/tests/integration/test_import.py b/umap/tests/integration/test_import.py index 73bee1ad..31de9fdd 100644 --- a/umap/tests/integration/test_import.py +++ b/umap/tests/integration/test_import.py @@ -71,10 +71,6 @@ def test_umap_import_from_file(live_server, tilelayer, page): expect(nonloaded).to_have_count(1) -@pytest.mark.skipif( - os.environ.get("CI", "false") == "true", - reason="Test is failing intermittently, skipping in the CI", -) def test_umap_import_from_textarea(live_server, tilelayer, page, settings): settings.UMAP_ALLOW_ANONYMOUS = True page.goto(f"{live_server.url}/map/new/") diff --git a/umap/tests/integration/test_map.py b/umap/tests/integration/test_map.py index 3dd89797..f2308d80 100644 --- a/umap/tests/integration/test_map.py +++ b/umap/tests/integration/test_map.py @@ -148,10 +148,6 @@ def test_default_view_latest_with_polygon(map, live_server, page): expect(layers).to_have_count(1) -@pytest.mark.skipif( - os.environ.get("CI", "false") == "true", - reason="Test is failing intermittently, skipping in the CI", -) def test_default_view_locate(browser, live_server, map): context = browser.new_context( geolocation={"longitude": 8.52967, "latitude": 39.16267},