rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-22 23:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Silence test_remote_storage failure, caused by error message change

Browse Source
This commit is contained in:
Heikki Linnakangas
2022-11-20 00:13:43 +02:00
parent eed99b7251
commit a78c16328e
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test_runner/regress/test_remote_storage.py
View File

@@ -66,8 +66,9 @@ def test_remote_storage_backup_and_restore(
env.pageserver.allowed_errors.append(".*Failed to get local tenant state.*")
# FIXME retry downloads without throwing errors
env.pageserver.allowed_errors.append(".*failed to load remote timeline.*")
# we have a bunch of pytest.raises for this below
# we have a bunch of pytest.raises for these below
env.pageserver.allowed_errors.append(".*tenant already exists.*")
env.pageserver.allowed_errors.append(".*attach is already in progress.*")
pageserver_http = env.pageserver.http_client()
pg = env.postgres.create_start("main")
@@ -134,7 +135,7 @@ def test_remote_storage_backup_and_restore(
env.pageserver.start()
# ensure that an initiated attach operation survives pageserver restart
with pytest.raises(Exception, match="tenant already exists"):
with pytest.raises(Exception, match=r".*(tenant already exists|attach is already in progress).*"):
client.tenant_attach(tenant_id)
log.info("waiting for timeline redownload")
wait_until(

5
test_runner/regress/test_tenants_with_remote_storage.py
View File

@@ -339,10 +339,7 @@ def test_tenant_redownloads_truncated_file_on_startup(
env = neon_env_builder.init_start()
env.pageserver.allowed_errors.append(
".*Redownloading locally existing .* due to size mismatch.*"
)
env.pageserver.allowed_errors.append(
".*Downloaded layer exists already but layer file metadata mismatches.*"
".*removing local file .* because it has unexpected length.*"
)
# FIXME: Are these expected?