1
1
import unittest
2
2
import os
3
3
from time import sleep , time
4
- from .helpers .ptrack_helpers import ProbackupTest , ProbackupException
4
+ from .helpers .ptrack_helpers import base36enc , ProbackupTest , ProbackupException
5
5
import shutil
6
6
from distutils .dir_util import copy_tree
7
7
from testgres import ProcessType , QueryException
@@ -3417,22 +3417,22 @@ def test_start_time(self):
3417
3417
node .slow_start ()
3418
3418
3419
3419
# FULL backup
3420
- startTime = str ( int (time () ))
3420
+ startTime = int (time ())
3421
3421
self .backup_node (
3422
3422
backup_dir , 'node' , node , backup_type = 'full' ,
3423
- options = ['--stream' , '--start-time={0}' .format (startTime )])
3424
- # restore FULL backup by the start-time
3425
- node .cleanup ()
3423
+ options = ['--stream' , '--start-time={0}' .format (str (startTime ))])
3424
+ # restore FULL backup by backup_id calculated from start-time
3426
3425
self .restore_node (
3427
- backup_dir , 'node' , node ,
3428
- options = ['--start-time={0}' .format (startTime )])
3426
+ backup_dir , 'node' ,
3427
+ data_dir = os .path .join (self .tmp_path , module_name , fname , 'node_restored_full' ),
3428
+ backup_id = base36enc (startTime ))
3429
3429
3430
3430
#FULL backup with incorrect start time
3431
3431
try :
3432
3432
startTime = str (int (time ()- 100000 ))
3433
3433
self .backup_node (
3434
- backup_dir , 'node' , node , backup_type = 'full' ,
3435
- options = ['--stream' , '--start-time={0}' .format (startTime )])
3434
+ backup_dir , 'node' , node , backup_type = 'full' ,
3435
+ options = ['--stream' , '--start-time={0}' .format (startTime )])
3436
3436
# we should die here because exception is what we expect to happen
3437
3437
self .assertEqual (
3438
3438
1 , 0 ,
@@ -3447,45 +3447,42 @@ def test_start_time(self):
3447
3447
repr (e .message ), self .cmd ))
3448
3448
3449
3449
# DELTA backup
3450
- node .slow_start ()
3451
- startTime = str (int (time ()))
3450
+ startTime = int (time ())
3452
3451
self .backup_node (
3453
3452
backup_dir , 'node' , node , backup_type = 'delta' ,
3454
- options = ['--stream' , '--start-time={0}' .format (startTime )])
3455
- # restore DELTA backup by the start-time
3456
- node .cleanup ()
3453
+ options = ['--stream' , '--start-time={0}' .format (str (startTime ))])
3454
+ # restore DELTA backup by backup_id calculated from start-time
3457
3455
self .restore_node (
3458
- backup_dir , 'node' , node ,
3459
- options = ['--start-time={0}' .format (startTime )])
3456
+ backup_dir , 'node' ,
3457
+ data_dir = os .path .join (self .tmp_path , module_name , fname , 'node_restored_delta' ),
3458
+ backup_id = base36enc (startTime ))
3460
3459
3461
3460
# PAGE backup
3462
- node .slow_start ()
3463
- startTime = str (int (time ()))
3461
+ startTime = int (time ())
3464
3462
self .backup_node (
3465
3463
backup_dir , 'node' , node , backup_type = 'page' ,
3466
- options = ['--stream' , '--start-time={0}' .format (startTime )])
3467
- # restore PAGE backup by the start-time
3468
- node .cleanup ()
3464
+ options = ['--stream' , '--start-time={0}' .format (str (startTime ))])
3465
+ # restore PAGE backup by backup_id calculated from start-time
3469
3466
self .restore_node (
3470
- backup_dir , 'node' , node ,
3471
- options = ['--start-time={0}' .format (startTime )])
3467
+ backup_dir , 'node' ,
3468
+ data_dir = os .path .join (self .tmp_path , module_name , fname , 'node_restored_page' ),
3469
+ backup_id = base36enc (startTime ))
3472
3470
3473
3471
# PTRACK backup
3474
3472
if self .ptrack :
3475
- node .slow_start ()
3476
3473
node .safe_psql (
3477
3474
'postgres' ,
3478
3475
'create extension ptrack' )
3479
3476
3480
- startTime = str ( int (time () ))
3477
+ startTime = int (time ())
3481
3478
self .backup_node (
3482
3479
backup_dir , 'node' , node , backup_type = 'ptrack' ,
3483
- options = ['--stream' , '--start-time={0}' .format (startTime )])
3484
-
3485
- node .cleanup ()
3480
+ options = ['--stream' , '--start-time={0}' .format (str (startTime ))])
3481
+ # restore PTRACK backup by backup_id calculated from start-time
3486
3482
self .restore_node (
3487
- backup_dir , 'node' , node ,
3488
- options = ['--start-time={0}' .format (startTime )])
3483
+ backup_dir , 'node' ,
3484
+ data_dir = os .path .join (self .tmp_path , module_name , fname , 'node_restored_ptrack' ),
3485
+ backup_id = base36enc (startTime ))
3489
3486
3490
3487
# Clean after yourself
3491
3488
self .del_test_dir (module_name , fname )
0 commit comments