diff --git a/test_runner/regress/test_hot_standby.py b/test_runner/regress/test_hot_standby.py index 6b003ce356..031fd2857d 100644 --- a/test_runner/regress/test_hot_standby.py +++ b/test_runner/regress/test_hot_standby.py @@ -1,10 +1,8 @@ import time -import pytest from fixtures.neon_fixtures import NeonEnv -@pytest.mark.timeout(1800) def test_hot_standby(neon_simple_env: NeonEnv): env = neon_simple_env diff --git a/test_runner/regress/test_import.py b/test_runner/regress/test_import.py index d35366b467..68086d3f84 100644 --- a/test_runner/regress/test_import.py +++ b/test_runner/regress/test_import.py @@ -23,7 +23,6 @@ from fixtures.types import Lsn, TenantId, TimelineId from fixtures.utils import subprocess_capture -@pytest.mark.timeout(600) def test_import_from_vanilla(test_output_dir, pg_bin, vanilla_pg, neon_env_builder): # Put data in vanilla pg vanilla_pg.start() @@ -163,7 +162,6 @@ def test_import_from_vanilla(test_output_dir, pg_bin, vanilla_pg, neon_env_build assert endpoint.safe_psql("select count(*) from t") == [(300000,)] -@pytest.mark.timeout(600) def test_import_from_pageserver_small(pg_bin: PgBin, neon_env_builder: NeonEnvBuilder): neon_env_builder.enable_local_fs_remote_storage() env = neon_env_builder.init_start() diff --git a/test_runner/regress/test_pg_regress.py b/test_runner/regress/test_pg_regress.py index d765316174..ee600db2c6 100644 --- a/test_runner/regress/test_pg_regress.py +++ b/test_runner/regress/test_pg_regress.py @@ -3,15 +3,11 @@ # from pathlib import Path -import pytest from fixtures.neon_fixtures import NeonEnv, check_restored_datadir_content # Run the main PostgreSQL regression tests, in src/test/regress. # -# This runs for a long time, especially in debug mode, so use a larger-than-default -# timeout. -@pytest.mark.timeout(1800) def test_pg_regress( neon_simple_env: NeonEnv, test_output_dir: Path, @@ -69,9 +65,6 @@ def test_pg_regress( # Run the PostgreSQL "isolation" tests, in src/test/isolation. # -# This runs for a long time, especially in debug mode, so use a larger-than-default -# timeout. -@pytest.mark.timeout(1800) def test_isolation( neon_simple_env: NeonEnv, test_output_dir: Path,