From 665f5d3e6cb83f4877c80232e493f7a1e457063f Mon Sep 17 00:00:00 2001 From: vshepard Date: Mon, 4 Mar 2024 09:18:41 +0100 Subject: [PATCH 1/2] Remove init param --- testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py | 1 - 1 file changed, 1 deletion(-) diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py b/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py index f81386aa..2bcf95a4 100644 --- a/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py +++ b/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py @@ -202,7 +202,6 @@ def __init__(self): self.delete_logs = delete_logs # s3 params - self.s3_config_file = test_env.get('PG_PROBACKUP_S3_CONFIG_FILE') self.s3_type = test_env.get('PG_PROBACKUP_S3_TEST') def test_env(self): From ec9a615b095667cd8a32b513a795402f6d6d6f5b Mon Sep 17 00:00:00 2001 From: vshepard Date: Mon, 4 Mar 2024 22:53:58 +0100 Subject: [PATCH 2/2] Safe group from re.search --- .../pg_probackup2/init_helpers.py | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py b/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py index 2bcf95a4..f392d1b9 100644 --- a/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py +++ b/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py @@ -148,21 +148,24 @@ def __init__(self): [self.probackup_path, "--version"], stderr=subprocess.STDOUT, ).decode('utf-8') - self.probackup_version = re.search(r"\d+\.\d+\.\d+", - probackup_version_output - ).group(0) - compressions = re.search(r"\(compressions: ([^)]*)\)", - probackup_version_output).group(1) - self.probackup_compressions = {s.strip() for s in compressions.split(',')} + match = re.search(r"\d+\.\d+\.\d+", + probackup_version_output) + self.probackup_version = match.group(0) if match else None + match = re.search(r"\(compressions: ([^)]*)\)", probackup_version_output) + compressions = match.group(1) if match else None + if compressions: + self.probackup_compressions = {s.strip() for s in compressions.split(',')} + else: + self.probackup_compressions = [] if self.probackup_old_path: old_probackup_version_output = subprocess.check_output( [self.probackup_old_path, "--version"], stderr=subprocess.STDOUT, ).decode('utf-8') - self.old_probackup_version = re.search(r"\d+\.\d+\.\d+", - old_probackup_version_output - ).group(0) + match = re.search(r"\d+\.\d+\.\d+", + old_probackup_version_output) + self.old_probackup_version = match.group(0) if match else None self.remote = test_env.get('PGPROBACKUP_SSH_REMOTE', None) == 'ON' self.ptrack = test_env.get('PG_PROBACKUP_PTRACK', None) == 'ON' and self.pg_config_version >= 110000