diff --git a/.circleci/config.yml b/.circleci/config.yml index cfb0f423f4..00a51eb906 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -355,7 +355,7 @@ workflows: matrix: parameters: build_type: ["debug", "release"] - test_selection: batch_others/test_ancestor_branch.py + test_selection: batch_others requires: - build-neon-<< matrix.build_type >> - run-pytest: diff --git a/test_runner/batch_others/test_ancestor_branch.py b/test_runner/batch_others/test_ancestor_branch.py index 30effbed4d..78909c5436 100644 --- a/test_runner/batch_others/test_ancestor_branch.py +++ b/test_runner/batch_others/test_ancestor_branch.py @@ -6,8 +6,8 @@ from fixtures.neon_fixtures import NeonEnv, NeonEnvBuilder, NeonPageserverApiExc # # Create ancestor branches off the main branch. # -@pytest.mark.parametrize("x", range(20)) -def test_ancestor_branch(neon_env_builder: NeonEnvBuilder, x: int): +# @pytest.mark.parametrize("x", range(20)) +def test_ancestor_branch(neon_env_builder: NeonEnvBuilder): env = neon_env_builder.init_start() # Override defaults, 1M gc_horizon and 4M checkpoint_distance. diff --git a/test_runner/batch_others/test_branch_and_gc.py b/test_runner/batch_others/test_branch_and_gc.py index 773e7798c6..815b95c592 100644 --- a/test_runner/batch_others/test_branch_and_gc.py +++ b/test_runner/batch_others/test_branch_and_gc.py @@ -41,7 +41,7 @@ from fixtures.utils import lsn_from_hex # Because the delta layer D covering lsn1 is corrupted, creating a branch # starting from lsn1 should return an error as follows: # could not find data for key ... at LSN ..., for request at LSN ... -@pytest.mark.skip("") +# @pytest.mark.skip("") def test_branch_and_gc(neon_simple_env: NeonEnv): env = neon_simple_env diff --git a/test_runner/batch_others/test_branching.py b/test_runner/batch_others/test_branching.py index 957d9a33b3..d6c9f41453 100644 --- a/test_runner/batch_others/test_branching.py +++ b/test_runner/batch_others/test_branching.py @@ -20,6 +20,7 @@ from performance.test_perf_pgbench import get_scales_matrix @pytest.mark.parametrize("n_branches", [10]) @pytest.mark.parametrize("scale", get_scales_matrix(1)) @pytest.mark.parametrize("ty", ["cascade", "flat"]) +@pytest.mark.skip("") def test_branching_with_pgbench(neon_simple_env: NeonEnv, pg_bin: PgBin, n_branches: int,