From a78c16328e30cf5e7e7a0f4dfdeec121550d11a1 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Sun, 20 Nov 2022 00:13:43 +0200 Subject: [PATCH] Silence test_remote_storage failure, caused by error message change --- test_runner/regress/test_remote_storage.py | 5 +++-- test_runner/regress/test_tenants_with_remote_storage.py | 5 +---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/test_runner/regress/test_remote_storage.py b/test_runner/regress/test_remote_storage.py index ec83d6eb9e..07f01bf78e 100644 --- a/test_runner/regress/test_remote_storage.py +++ b/test_runner/regress/test_remote_storage.py @@ -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( diff --git a/test_runner/regress/test_tenants_with_remote_storage.py b/test_runner/regress/test_tenants_with_remote_storage.py index 8fd28cf53e..5024b9b782 100644 --- a/test_runner/regress/test_tenants_with_remote_storage.py +++ b/test_runner/regress/test_tenants_with_remote_storage.py @@ -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?