From 5402d433fc4ca00d402c02a17abdf0b77db38d5d Mon Sep 17 00:00:00 2001 From: "s.logvinenko" Date: Wed, 8 Nov 2017 18:06:50 +0300 Subject: [PATCH] fix archive.py --- tests/helpers/ptrack_helpers.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/tests/helpers/ptrack_helpers.py b/tests/helpers/ptrack_helpers.py index 554cc939..d8139c86 100644 --- a/tests/helpers/ptrack_helpers.py +++ b/tests/helpers/ptrack_helpers.py @@ -133,10 +133,7 @@ class ProbackupTest(object): if self.test_env['PGPRO_PARANOIA_MODE'] == 'ON': self.paranoia = True - try: - testgres.configure_testgres(cache_initdb=False, cache_pg_config=False, node_cleanup_full=False) - except: - pass + testgres.configure_testgres(cache_initdb=False, cache_pg_config=False, node_cleanup_full=False) self.helpers_path = os.path.dirname(os.path.realpath(__file__)) self.dir_path = os.path.abspath(os.path.join(self.helpers_path, os.pardir)) @@ -192,14 +189,6 @@ class ProbackupTest(object): for key, value in six.iteritems(pg_options): node.append_conf("postgresql.auto.conf", "%s = %s" % (key, value)) - # Allow replication in pg_hba.conf - if set_replication: - try: - node.set_replication_conf() - node.append_conf("postgresql.auto.conf", "max_wal_senders = 10") - except: - pass - return node def create_tblspace_in_node(self, node, tblspc_name, cfs=False): @@ -644,11 +633,7 @@ class ProbackupTest(object): @staticmethod def switch_wal_segment(node): min_ver = LooseVersion('10.0') - - try: - cur_ver = LooseVersion(testgres.get_pg_version()) - except Exception as e: - cur_ver = LooseVersion(node.safe_psql("postgres", "show server_version")) + cur_ver = LooseVersion(testgres.get_pg_version()) if cur_ver >= min_ver: node.safe_psql("postgres", "select pg_switch_wal()")