Skip to content

Commit a6f88fd

Browse files
author
vshepard
committed
Merge master
1 parent a917ba2 commit a6f88fd

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
readme = f.read()
2828

2929
setup(
30-
version='1.9.4',
30+
version='1.10.0',
3131
name='testgres',
3232
packages=['testgres', 'testgres.operations', 'testgres.helpers'],
3333
description='Testing utility for PostgreSQL and its extensions',

testgres/plugins/pg_probackup2/pg_probackup2/app.py

+15-9
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import subprocess
55
import unittest
66

7-
from .init_helpers import init_params
87
from .storage.fs_backup import TestBackupDir
98
from .gdb import GDBobj
9+
from .init_helpers import init_params
1010

1111
warning = """
1212
Wrong splint in show_pb
@@ -132,12 +132,14 @@ def run(self, command, gdb=False, old_binary=False, return_id=True, env=None,
132132
def init(self, options=None, old_binary=False, skip_log_directory=False, expect_error=False, use_backup_dir=True):
133133
if options is None:
134134
options = []
135-
return self.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+
return self.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+
)
141143

142144
def add_instance(self, instance, node, old_binary=False, options=None, expect_error=False):
143145
if options is None:
@@ -325,7 +327,10 @@ def restore_node(
325327
if options is None:
326328
options = []
327329
if node:
328-
data_dir = node.data_dir
330+
if isinstance(node, str):
331+
data_dir = node
332+
else:
333+
data_dir = node.data_dir
329334
elif restore_dir:
330335
data_dir = self._node_dir(restore_dir)
331336
else:
@@ -533,6 +538,7 @@ def show_archive(
533538
break
534539

535540
if tli > 0:
541+
timeline_data = None
536542
for timeline in instance_timelines:
537543
if timeline['tli'] == tli:
538544
return timeline
@@ -661,7 +667,7 @@ def set_archiving(
661667
archive_command += ' --remote-proto=ssh --remote-host=localhost'
662668

663669
if init_params.archive_compress and compress:
664-
archive_command += ' --compress-algorithm=' + init_params.archive_compress
670+
archive_command += ' --compress-algorithm='+init_params.archive_compress
665671

666672
if overwrite:
667673
archive_command += ' --overwrite'

0 commit comments

Comments
 (0)