diff --git a/src/node.py b/src/node.py index 6fa4fed5..490a9b0c 100644 --- a/src/node.py +++ b/src/node.py @@ -985,7 +985,7 @@ def slow_start(self, replica=False, dbname='template1', username=None, max_attem self.poll_query_until( query=query, dbname=dbname, - username=username or self.os_ops.username, + username=username or self._os_ops.username, suppress=suppressed_exceptions, max_attempts=max_attempts, ) @@ -1450,7 +1450,7 @@ def _psql( self._get_bin_path("psql"), "-p", str(port), "-h", host, - "-U", username or self.os_ops.username, + "-U", username or self._os_ops.username, "-d", dbname or default_dbname(), "-X", # no .psqlrc "-A", # unaligned output @@ -1565,7 +1565,7 @@ def tmpfile(): "-p", str(self.port), "-h", self.host, "-f", filename, - "-U", username or self.os_ops.username, + "-U", username or self._os_ops.username, "-d", dbname or default_dbname(), "-F", format.value ] # yapf: disable @@ -1590,7 +1590,7 @@ def restore(self, filename, dbname=None, username=None): # Set default arguments dbname = dbname or default_dbname() - username = username or self.os_ops.username + username = username or self._os_ops.username _params = [ self._get_bin_path("pg_restore"), @@ -1868,7 +1868,7 @@ def pgbench(self, self._get_bin_path("pgbench"), "-p", str(self.port), "-h", self.host, - "-U", username or self.os_ops.username + "-U", username or self._os_ops.username ] + options # yapf: disable # should be the last one @@ -1941,7 +1941,7 @@ def pgbench_run(self, dbname=None, username=None, options=[], **kwargs): self._get_bin_path("pgbench"), "-p", str(self.port), "-h", self.host, - "-U", username or self.os_ops.username + "-U", username or self._os_ops.username ] + options # yapf: disable for key, value in iteritems(kwargs):