Merge pull request #14 from stalkerg/master

merge fixes by @stalkerg

Author: funbringer

testgres/testgres.py

@@ -193,12 +193,11 @@ def init(self, allows_streaming=False):
         # initialize cluster
         os.makedirs(self.data_dir)
         initdb = self.get_bin_path("initdb")
-        with open(self.output_filename, "a") as file_out, \
-                open(self.error_filename, "a") as file_err:
+        with open(os.path.join(self.logs_dir, "initdb.log"), "a") as file_out:
             ret = subprocess.call(
                 [initdb, self.data_dir, "-N"],
                 stdout=file_out,
-                stderr=file_err
+                stderr=subprocess.STDOUT
             )
             if ret:
                 raise ClusterException("Cluster initialization failed")
@@ -229,7 +228,7 @@ def init(self, allows_streaming=False):
                 else:
                     conf.write("wal_level = replica\n")
 
-        self.set_replication_conf()
+                self.set_replication_conf()
 
         return self