tests minor cleanup

Author: gsmolk

Diff for: tests/external.py

@@ -128,6 +128,7 @@ def test_external_none(self):
         self.backup_node(
             backup_dir, 'node', node,
             options=[
+                '--stream',
                 '--external-dirs={0}'.format(external_dir)])
 
         # Delta backup without external directory

Diff for: tests/restore.py

@@ -1344,10 +1344,6 @@ def test_zags_block_corrupt_1(self):
             'postgres',
             'insert into tbl select i from generate_series(0,100000) as i')
 
-        print(node.safe_psql(
-            'postgres',
-            "select pg_relation_size('idx')"))
-
         node.safe_psql(
             'postgres',
             'delete from tbl where i%2 = 0')
@@ -1364,10 +1360,6 @@ def test_zags_block_corrupt_1(self):
             'postgres',
             'create extension pageinspect')
 
-        print(node.safe_psql(
-            'postgres',
-            "select * from bt_page_stats('idx',1)"))
-
         node.safe_psql(
             'postgres',
             'checkpoint')
@@ -1413,8 +1405,8 @@ def test_zags_block_corrupt_1(self):
                 if 'selected new timeline ID' in f.read():
                     break
 
-        with open(node_restored.pg_log_file, 'r') as f:
-                print(f.read())
+        # with open(node_restored.pg_log_file, 'r') as f:
+        #        print(f.read())
 
         pgdata_restored = self.pgdata_content(node_restored.data_dir)
 
@@ -1905,8 +1897,8 @@ def test_restore_target_latest_archive(self):
         self.restore_node(
             backup_dir, 'node', node)
 
-        with open(recovery_conf, 'r') as f:
-            print(f.read())
+        # with open(recovery_conf, 'r') as f:
+        #    print(f.read())
 
         hash_1 = hashlib.md5(
             open(recovery_conf, 'rb').read()).hexdigest()
@@ -1916,8 +1908,8 @@ def test_restore_target_latest_archive(self):
         self.restore_node(
             backup_dir, 'node', node, options=['--recovery-target=latest'])
 
-        with open(recovery_conf, 'r') as f:
-            print(f.read())
+        # with open(recovery_conf, 'r') as f:
+        #     print(f.read())
 
         hash_2 = hashlib.md5(
             open(recovery_conf, 'rb').read()).hexdigest()
@@ -1999,8 +1991,6 @@ def test_restore_target_new_options(self):
         with open(recovery_conf, 'r') as f:
             recovery_conf_content = f.read()
 
-        print(recovery_conf_content)
-
         self.assertIn(
             "recovery_target_time = '{0}'".format(target_time),
             recovery_conf_content)
@@ -2028,8 +2018,6 @@ def test_restore_target_new_options(self):
         with open(recovery_conf, 'r') as f:
             recovery_conf_content = f.read()
 
-        print(recovery_conf_content)
-
         self.assertIn(
             "recovery_target_xid = '{0}'".format(target_xid),
             recovery_conf_content)
@@ -2057,8 +2045,6 @@ def test_restore_target_new_options(self):
         with open(recovery_conf, 'r') as f:
             recovery_conf_content = f.read()
 
-        print(recovery_conf_content)
-
         self.assertIn(
             "recovery_target_lsn = '{0}'".format(target_lsn),
             recovery_conf_content)
@@ -2086,8 +2072,6 @@ def test_restore_target_new_options(self):
         with open(recovery_conf, 'r') as f:
             recovery_conf_content = f.read()
 
-        print(recovery_conf_content)
-
         self.assertIn(
             "recovery_target_name = '{0}'".format(target_name),
             recovery_conf_content)