Content-Length: 6582 | pFad | http://github.com/postgrespro/testgres/pull/119.patch

thub.com From 3dc640fb7d6df7e5bbdd1970376773f3d9b7bd09 Mon Sep 17 00:00:00 2001 From: "e.garbuz" Date: Thu, 4 Apr 2024 14:11:09 +0300 Subject: [PATCH 1/6] Value pg_probackup major_version added to the class Init --- testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py b/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py index e3dd9e4f..b6bf90f4 100644 --- a/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py +++ b/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py @@ -204,6 +204,8 @@ def __init__(self): os.environ["PGAPPNAME"] = "pg_probackup" self.delete_logs = delete_logs + self.major_version = int(self.probackup_version.split('.')[0]) + def test_env(self): return self._test_env.copy() From 2a0c37b9e139cd0a2fc40eedc4edff1fa96dbf66 Mon Sep 17 00:00:00 2001 From: "e.garbuz" Date: Mon, 8 Apr 2024 17:57:55 +0300 Subject: [PATCH 2/6] Add check on digit for probackup_version --- testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py | 4 +++- 1 file changed, 3 insertions(+), 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 b6bf90f4..109a411e 100644 --- a/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py +++ b/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py @@ -204,7 +204,9 @@ def __init__(self): os.environ["PGAPPNAME"] = "pg_probackup" self.delete_logs = delete_logs - self.major_version = int(self.probackup_version.split('.')[0]) + self.major_version = 0 + if self.probackup_version.split('.')[0].isdigit: + self.major_version = int(self.probackup_version.split('.')[0]) def test_env(self): return self._test_env.copy() From 5db4ae393e4b4f69b5721b27e9c80fc3dcd5c044 Mon Sep 17 00:00:00 2001 From: "e.garbuz" Date: Tue, 9 Apr 2024 13:01:07 +0300 Subject: [PATCH 3/6] Break when pg_probackup version is incorrect --- testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py | 4 +++- 1 file changed, 3 insertions(+), 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 109a411e..318877af 100644 --- a/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py +++ b/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py @@ -204,9 +204,11 @@ def __init__(self): os.environ["PGAPPNAME"] = "pg_probackup" self.delete_logs = delete_logs - self.major_version = 0 if self.probackup_version.split('.')[0].isdigit: self.major_version = int(self.probackup_version.split('.')[0]) + else: + print('Pg_probackup version is not correct!') + sys.exit(1) def test_env(self): return self._test_env.copy() From 3a90ecd41293aa08c2db662ce73ecad0f34b8636 Mon Sep 17 00:00:00 2001 From: "e.garbuz" Date: Tue, 9 Apr 2024 13:36:42 +0300 Subject: [PATCH 4/6] Adding print incorrect version --- testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py | 2 +- 1 file changed, 1 insertion(+), 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 318877af..f8c9f3b3 100644 --- a/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py +++ b/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py @@ -207,7 +207,7 @@ def __init__(self): if self.probackup_version.split('.')[0].isdigit: self.major_version = int(self.probackup_version.split('.')[0]) else: - print('Pg_probackup version is not correct!') + print('Pg_probackup version \"{}\" is not correct!'.format(self.probackup_version)) sys.exit(1) def test_env(self): From ea05a4afc54a9ed65769921b9221afec378a6df1 Mon Sep 17 00:00:00 2001 From: "e.garbuz" Date: Wed, 10 Apr 2024 09:45:17 +0300 Subject: [PATCH 5/6] Correction of remarks --- testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py b/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py index f8c9f3b3..9231ac04 100644 --- a/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py +++ b/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py @@ -204,10 +204,10 @@ def __init__(self): os.environ["PGAPPNAME"] = "pg_probackup" self.delete_logs = delete_logs - if self.probackup_version.split('.')[0].isdigit: + if self.probackup_version.split('.')[0].isdigit(): self.major_version = int(self.probackup_version.split('.')[0]) else: - print('Pg_probackup version \"{}\" is not correct!'.format(self.probackup_version)) + print('Pg_probackup version \"{}\" is not correct! Expected that the major pg_probackup version should be a number.'.format(self.probackup_version)) sys.exit(1) def test_env(self): From 5b8a8369cbc0517c4aecacfa35b2955d8e9a4a0d Mon Sep 17 00:00:00 2001 From: "e.garbuz" Date: Wed, 10 Apr 2024 14:23:31 +0300 Subject: [PATCH 6/6] Changed error message --- testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py | 2 +- 1 file changed, 1 insertion(+), 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 9231ac04..73731a6e 100644 --- a/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py +++ b/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py @@ -207,7 +207,7 @@ def __init__(self): if self.probackup_version.split('.')[0].isdigit(): self.major_version = int(self.probackup_version.split('.')[0]) else: - print('Pg_probackup version \"{}\" is not correct! Expected that the major pg_probackup version should be a number.'.format(self.probackup_version)) + print('Can\'t process pg_probackup version \"{}\": the major version is expected to be a number'.format(self.probackup_version)) sys.exit(1) def test_env(self):

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!