@@ -369,14 +369,16 @@ def test_archive_push_file_exists(self):
369369self .add_instance (backup_dir ,'node' ,node )
370370self .set_archiving (backup_dir ,'node' ,node )
371371
372- wals_dir = os .path .join (backup_dir ,'wal' ,'node' )
372+ wals_dir = os .path .join (backup_dir ,'wal' ,'node' , '00000000' )
373373if self .archive_compress :
374374filename = '000000010000000000000001.gz'
375375file = os .path .join (wals_dir ,filename )
376376else :
377377filename = '000000010000000000000001'
378378file = os .path .join (wals_dir ,filename )
379379
380+ os .makedirs (wals_dir )
381+
380382with open (file ,'a+b' )as f :
381383f .write (b"blablablaadssaaaaaaaaaaaaaaa" )
382384f .flush ()
@@ -469,6 +471,8 @@ def test_archive_push_file_exists_overwrite(self):
469471filename = '000000010000000000000001'
470472file = os .path .join (wals_dir ,filename )
471473
474+ os .makedirs (wals_dir )
475+
472476with open (file ,'a+b' )as f :
473477f .write (b"blablablaadssaaaaaaaaaaaaaaa" )
474478f .flush ()
@@ -565,14 +569,16 @@ def test_archive_push_partial_file_exists(self):
565569filename_orig = filename_orig .decode ('utf-8' )
566570
567571# form up path to next .part WAL segment
568- wals_dir = os .path .join (backup_dir ,'wal' ,'node' )
572+ wals_dir = os .path .join (backup_dir ,'wal' ,'node' , '00000000' )
569573if self .archive_compress :
570574filename = filename_orig + '.gz' + '.part'
571575file = os .path .join (wals_dir ,filename )
572576else :
573577filename = filename_orig + '.part'
574578file = os .path .join (wals_dir ,filename )
575579
580+ # os.makedirs(wals_dir)
581+
576582# emulate stale .part file
577583with open (file ,'a+b' )as f :
578584f .write (b"blahblah" )
@@ -1111,6 +1117,7 @@ def test_archive_pg_receivexlog(self):
11111117self .init_pb (backup_dir )
11121118self .add_instance (backup_dir ,'node' ,node )
11131119node .slow_start ()
1120+
11141121if self .get_version (node )< 100000 :
11151122pg_receivexlog_path = self .get_bin_path ('pg_receivexlog' )
11161123else :
@@ -1597,7 +1604,7 @@ def test_archive_catalog_1(self):
15971604self .backup_node (backup_dir ,'node' ,node )
15981605node .pgbench_init (scale = 2 )
15991606
1600- wals_dir = os .path .join (backup_dir ,'wal' ,'node' )
1607+ wals_dir = os .path .join (backup_dir ,'wal' ,'node' , '00000000' )
16011608original_file = os .path .join (wals_dir ,'000000010000000000000001.gz' )
16021609tmp_file = os .path .join (wals_dir ,'000000010000000000000001' )
16031610
@@ -1652,7 +1659,7 @@ def test_archive_catalog_2(self):
16521659self .backup_node (backup_dir ,'node' ,node )
16531660node .pgbench_init (scale = 2 )
16541661
1655- wals_dir = os .path .join (backup_dir ,'wal' ,'node' )
1662+ wals_dir = os .path .join (backup_dir ,'wal' ,'node' , '00000000' )
16561663original_file = os .path .join (wals_dir ,'000000010000000000000001.gz' )
16571664tmp_file = os .path .join (wals_dir ,'000000010000000000000001' )
16581665
@@ -2376,7 +2383,7 @@ def test_archive_get_prefetch_corruption(self):
23762383sleep (20 )
23772384
23782385# now copy WAL files into prefetch directory and corrupt some of them
2379- archive_dir = os .path .join (backup_dir ,'wal' ,'node' )
2386+ archive_dir = os .path .join (backup_dir ,'wal' ,'node' , '00000000' )
23802387files = os .listdir (archive_dir )
23812388files .sort ()
23822389
@@ -2462,7 +2469,7 @@ def test_archive_show_partial_files_handling(self):
24622469
24632470self .backup_node (backup_dir ,'node' ,node )
24642471
2465- wals_dir = os .path .join (backup_dir ,'wal' ,'node' )
2472+ wals_dir = os .path .join (backup_dir ,'wal' ,'node' , '00000000' )
24662473
24672474# .part file
24682475node .safe_psql (