Merge branch 'master' of https://git.postgrespro.ru/pgpro-dev/pg_probackup into cfs

s.logvinenko · s.logvinenko · commit 2593e10a9ba9 · 2017-10-04T17:03:03.000+03:00
Conflicts:
	tests/__init__.py
diff --git a/tests/helpers/ptrack_helpers.py b/tests/helpers/ptrack_helpers.py
@@ -4,7 +4,7 @@
 import subprocess
 import shutil
 import six
-from testgres import get_new_node, clean_all
+import testgres
 import hashlib
 import re
 import pwd
@@ -153,7 +153,7 @@ def make_simple_node(
         real_base_dir = os.path.join(self.tmp_path, base_dir)
         shutil.rmtree(real_base_dir, ignore_errors=True)
 
-        node = get_new_node('test', base_dir=real_base_dir)
+        node = testgres.get_new_node('test', base_dir=real_base_dir)
         node.init(initdb_params=initdb_params)
 
         # Sane default parameters, not a shit with fsync = off from testgres
@@ -585,7 +585,7 @@ def get_username(self):
     def del_test_dir(self, module_name, fname):
         """ Del testdir and optimistically try to del module dir"""
         try:
-            clean_all()
+            testgres.clean_all()
         except:
             pass
 
