[Issue #449] fix tests

Author: gsmolk

tests/archive.py

@@ -369,14 +369,16 @@ def test_archive_push_file_exists(self):
         self.add_instance(backup_dir, 'node', node)
         self.set_archiving(backup_dir, 'node', node)
 
-        wals_dir = os.path.join(backup_dir, 'wal', 'node')
+        wals_dir = os.path.join(backup_dir, 'wal', 'node', '00000000')
         if self.archive_compress:
             filename = '000000010000000000000001.gz'
             file = os.path.join(wals_dir, filename)
         else:
             filename = '000000010000000000000001'
             file = os.path.join(wals_dir, filename)
 
+        os.makedirs(wals_dir)
+
         with open(file, 'a+b') as f:
             f.write(b"blablablaadssaaaaaaaaaaaaaaa")
             f.flush()
@@ -469,6 +471,8 @@ def test_archive_push_file_exists_overwrite(self):
             filename = '000000010000000000000001'
             file = os.path.join(wals_dir, filename)
 
+        os.makedirs(wals_dir)
+
         with open(file, 'a+b') as f:
             f.write(b"blablablaadssaaaaaaaaaaaaaaa")
             f.flush()
@@ -565,14 +569,16 @@ def test_archive_push_partial_file_exists(self):
         filename_orig = filename_orig.decode('utf-8')
 
         # form up path to next .part WAL segment
-        wals_dir = os.path.join(backup_dir, 'wal', 'node')
+        wals_dir = os.path.join(backup_dir, 'wal', 'node', '00000000')
         if self.archive_compress:
             filename = filename_orig + '.gz' + '.part'
             file = os.path.join(wals_dir, filename)
         else:
             filename = filename_orig + '.part'
             file = os.path.join(wals_dir, filename)
 
+#        os.makedirs(wals_dir)
+
         # emulate stale .part file
         with open(file, 'a+b') as f:
             f.write(b"blahblah")
@@ -1111,6 +1117,7 @@ def test_archive_pg_receivexlog(self):
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'node', node)
         node.slow_start()
+
         if self.get_version(node) < 100000:
             pg_receivexlog_path = self.get_bin_path('pg_receivexlog')
         else:
@@ -1597,7 +1604,7 @@ def test_archive_catalog_1(self):
         self.backup_node(backup_dir, 'node', node)
         node.pgbench_init(scale=2)
 
-        wals_dir = os.path.join(backup_dir, 'wal', 'node')
+        wals_dir = os.path.join(backup_dir, 'wal', 'node', '00000000')
         original_file = os.path.join(wals_dir, '000000010000000000000001.gz')
         tmp_file = os.path.join(wals_dir, '000000010000000000000001')
 
@@ -1652,7 +1659,7 @@ def test_archive_catalog_2(self):
         self.backup_node(backup_dir, 'node', node)
         node.pgbench_init(scale=2)
 
-        wals_dir = os.path.join(backup_dir, 'wal', 'node')
+        wals_dir = os.path.join(backup_dir, 'wal', 'node', '00000000')
         original_file = os.path.join(wals_dir, '000000010000000000000001.gz')
         tmp_file = os.path.join(wals_dir, '000000010000000000000001')
 
@@ -2376,7 +2383,7 @@ def test_archive_get_prefetch_corruption(self):
         sleep(20)
 
         # now copy WAL files into prefetch directory and corrupt some of them
-        archive_dir = os.path.join(backup_dir, 'wal', 'node')
+        archive_dir = os.path.join(backup_dir, 'wal', 'node', '00000000')
         files = os.listdir(archive_dir)
         files.sort()
 
@@ -2462,7 +2469,7 @@ def test_archive_show_partial_files_handling(self):
 
         self.backup_node(backup_dir, 'node', node)
 
-        wals_dir = os.path.join(backup_dir, 'wal', 'node')
+        wals_dir = os.path.join(backup_dir, 'wal', 'node', '00000000')
 
         # .part file
         node.safe_psql(