tests: common log allow list for ancestor detach tests (#7645)

These log lines were repeated, and
`test_detached_receives_flushes_while_being_detached` had an incomplete
definition.

Example failure:
https://neon-github-public-dev.s3.amazonaws.com/reports/pr-7531/8989511410/index.html#suites/a1c2be32556270764423c495fad75d47/992897d3a3369210
This commit is contained in:
John Spray
2024-05-08 08:50:34 +01:00
committed by GitHub
parent b827e7b330
commit 586e77bb24

View File

@@ -48,6 +48,12 @@ class Branchpoint(str, enum.Enum):
]
SHUTDOWN_ALLOWED_ERRORS = [
".*initial size calculation failed: downloading failed, possibly for shutdown",
".*failed to freeze and flush: cannot flush frozen layers when flush_loop is not running, state is Exited",
]
@pytest.mark.parametrize("branchpoint", Branchpoint.all())
@pytest.mark.parametrize("restart_after", [True, False])
def test_ancestor_detach_branched_from(
@@ -61,12 +67,7 @@ def test_ancestor_detach_branched_from(
env = neon_env_builder.init_start()
env.pageserver.allowed_errors.extend(
[
".*initial size calculation failed: downloading failed, possibly for shutdown",
".*failed to freeze and flush: cannot flush frozen layers when flush_loop is not running, state is Exited",
]
)
env.pageserver.allowed_errors.extend(SHUTDOWN_ALLOWED_ERRORS)
client = env.pageserver.http_client()
@@ -208,13 +209,7 @@ def test_ancestor_detach_reparents_earlier(neon_env_builder: NeonEnvBuilder, res
env = neon_env_builder.init_start()
env.pageserver.allowed_errors.extend(
[
".*initial size calculation failed: downloading failed, possibly for shutdown",
# after restart this is likely to happen if there is other load on the runner
".*failed to freeze and flush: cannot flush frozen layers when flush_loop is not running, state is Exited",
]
)
env.pageserver.allowed_errors.extend(SHUTDOWN_ALLOWED_ERRORS)
client = env.pageserver.http_client()
@@ -396,9 +391,7 @@ def test_detached_receives_flushes_while_being_detached(
with env.endpoints.create_start("new main", tenant_id=env.initial_tenant) as ep:
assert ep.safe_psql("SELECT count(*) FROM foo;")[0][0] == rows
env.pageserver.allowed_errors.append(
"initial size calculation failed: downloading failed, possibly for shutdown"
)
env.pageserver.allowed_errors.extend(SHUTDOWN_ALLOWED_ERRORS)
# TODO: