From 615a54edb56d88f119cb81c764c91f8e636102a8 Mon Sep 17 00:00:00 2001 From: Grigory Smolkin Date: Fri, 19 Jun 2020 10:49:32 +0300 Subject: [PATCH] tests: minor fixes --- tests/backup.py | 2 +- tests/delta.py | 23 ++++++++--------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/tests/backup.py b/tests/backup.py index f4712ad7..fadc2aa5 100644 --- a/tests/backup.py +++ b/tests/backup.py @@ -1601,7 +1601,7 @@ class BackupTest(ProbackupTest, unittest.TestCase): options=['--stream', '--slot=slot_1', '--temp-slot']) # Clean after yourself - self.del_test_dir(module_name, fname) + self.del_test_dir(module_name, fname, [node]) # @unittest.skip("skip") def test_backup_concurrent_drop_table(self): diff --git a/tests/delta.py b/tests/delta.py index 6b2ebf92..0abdd1c2 100644 --- a/tests/delta.py +++ b/tests/delta.py @@ -45,39 +45,32 @@ class DeltaTest(ProbackupTest, unittest.TestCase): "create table t_heap as select i as id, " "md5(i::text) as text, " "md5(repeat(i::text,10))::tsvector as tsvector " - "from generate_series(0,1024) i;" - ) + "from generate_series(0,1024) i;") node.safe_psql( "postgres", - "vacuum t_heap" - ) + "vacuum t_heap") self.backup_node(backup_dir, 'node', node, options=['--stream']) node.safe_psql( "postgres", - "delete from t_heap where ctid >= '(11,0)'" - ) + "delete from t_heap where ctid >= '(11,0)'") node.safe_psql( "postgres", - "vacuum t_heap" - ) + "vacuum t_heap") self.backup_node( - backup_dir, 'node', node, backup_type='delta' - ) + backup_dir, 'node', node, backup_type='delta') self.backup_node( - backup_dir, 'node', node, backup_type='delta' - ) + backup_dir, 'node', node, backup_type='delta') pgdata = self.pgdata_content(node.data_dir) self.restore_node( - backup_dir, 'node', node_restored - ) + backup_dir, 'node', node_restored) # Physical comparison pgdata_restored = self.pgdata_content(node_restored.data_dir) @@ -87,7 +80,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase): node_restored.slow_start() # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname, [node, node_restored]) # @unittest.skip("skip") def test_delta_vacuum_truncate_1(self):