From 5dc68e4e6ae13a486113af001af4445f6adb4f93 Mon Sep 17 00:00:00 2001 From: a-masterov <72613290+a-masterov@users.noreply.github.com> Date: Mon, 30 Sep 2024 16:37:14 +0200 Subject: [PATCH] test_compatibility: fix the regexes detecting the version (#9205) ## Problem The Neon components, built locally and by the GitHub workflow have slightly different version prefixes (git: vs git-env:) This does not allow running tests against local builds correctly. ## Summary of changes The regular expressions were changed to work with both prefixes. --- test_runner/regress/test_compatibility.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test_runner/regress/test_compatibility.py b/test_runner/regress/test_compatibility.py index b559be5f18..0669105625 100644 --- a/test_runner/regress/test_compatibility.py +++ b/test_runner/regress/test_compatibility.py @@ -252,7 +252,7 @@ def test_forward_compatibility( # not using env.pageserver.version because it was initialized before prev_pageserver_version_str = env.get_binary_version("pageserver") prev_pageserver_version_match = re.search( - "Neon page server git-env:(.*) failpoints: (.*), features: (.*)", + "Neon page server git(?:-env)?:(.*) failpoints: (.*), features: (.*)", prev_pageserver_version_str, ) if prev_pageserver_version_match is not None: @@ -263,12 +263,12 @@ def test_forward_compatibility( ) # does not include logs from previous runs - assert not env.pageserver.log_contains("git-env:" + prev_pageserver_version) + assert not env.pageserver.log_contains(f"git(-env)?:{prev_pageserver_version}") env.start() # ensure the specified pageserver is running - assert env.pageserver.log_contains("git-env:" + prev_pageserver_version) + assert env.pageserver.log_contains(f"git(-env)?:{prev_pageserver_version}") check_neon_works( env,