|
4 | 4 | importsubprocess |
5 | 5 | importunittest |
6 | 6 |
|
7 | | -from .init_helpersimportinit_params |
8 | 7 | from .storage.fs_backupimportTestBackupDir |
9 | 8 | from .gdbimportGDBobj |
| 9 | +from .init_helpersimportinit_params |
10 | 10 |
|
11 | 11 | warning=""" |
12 | 12 | Wrong splint in show_pb |
@@ -132,12 +132,14 @@ def run(self, command, gdb=False, old_binary=False, return_id=True, env=None, |
132 | 132 | definit(self,options=None,old_binary=False,skip_log_directory=False,expect_error=False,use_backup_dir=True): |
133 | 133 | ifoptionsisNone: |
134 | 134 | options= [] |
135 | | -returnself.run(['init', ]+options, |
136 | | -old_binary=old_binary, |
137 | | -skip_log_directory=skip_log_directory, |
138 | | -expect_error=expect_error, |
139 | | -use_backup_dir=use_backup_dir |
140 | | - ) |
| 135 | +returnself.run([ |
| 136 | +'init', |
| 137 | + ]+options, |
| 138 | +old_binary=old_binary, |
| 139 | +skip_log_directory=skip_log_directory, |
| 140 | +expect_error=expect_error, |
| 141 | +use_backup_dir=use_backup_dir |
| 142 | + ) |
141 | 143 |
|
142 | 144 | defadd_instance(self,instance,node,old_binary=False,options=None,expect_error=False): |
143 | 145 | ifoptionsisNone: |
@@ -325,7 +327,10 @@ def restore_node( |
325 | 327 | ifoptionsisNone: |
326 | 328 | options= [] |
327 | 329 | ifnode: |
328 | | -data_dir=node.data_dir |
| 330 | +ifisinstance(node,str): |
| 331 | +data_dir=node |
| 332 | +else: |
| 333 | +data_dir=node.data_dir |
329 | 334 | elifrestore_dir: |
330 | 335 | data_dir=self._node_dir(restore_dir) |
331 | 336 | else: |
@@ -533,6 +538,7 @@ def show_archive( |
533 | 538 | break |
534 | 539 |
|
535 | 540 | iftli>0: |
| 541 | +timeline_data=None |
536 | 542 | fortimelineininstance_timelines: |
537 | 543 | iftimeline['tli']==tli: |
538 | 544 | returntimeline |
@@ -661,7 +667,7 @@ def set_archiving( |
661 | 667 | archive_command+=' --remote-proto=ssh --remote-host=localhost' |
662 | 668 |
|
663 | 669 | ifinit_params.archive_compressandcompress: |
664 | | -archive_command+=' --compress-algorithm='+init_params.archive_compress |
| 670 | +archive_command+=' --compress-algorithm='+init_params.archive_compress |
665 | 671 |
|
666 | 672 | ifoverwrite: |
667 | 673 | archive_command+=' --overwrite' |
|
