Make dbname optional in psql commands

ildus · ildus · commit a89931994119 · 2018-02-15T14:52:35.000+03:00
diff --git a/testgres/testgres.py b/testgres/testgres.py
@@ -853,7 +853,7 @@ def cleanup(self, max_attempts=3):
 
         return self
 
-    def psql(self, dbname, query=None, filename=None, username=None):
+    def psql(self, query, filename=None, username=None, dbname='postgres'):
         """
         Execute a query using psql.
 
@@ -896,7 +896,7 @@ def psql(self, dbname, query=None, filename=None, username=None):
         out, err = process.communicate()
         return process.returncode, out, err
 
-    def safe_psql(self, dbname, query, username=None):
+    def safe_psql(self, query, username=None, dbname='postgres'):
         """
         Execute a query using psql.
 
@@ -909,7 +909,7 @@ def safe_psql(self, dbname, query, username=None):
             psql's output as str.
         """
 
-        ret, out, err = self.psql(dbname, query, username=username)
+        ret, out, err = self.psql(query, username=username, dbname=dbname)
         if ret:
             err = '' if not err else err.decode('utf-8')
             raise QueryException(err)
diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -2,7 +2,6 @@
 # coding: utf-8
 
 import os
-import re
 import six
 import subprocess
 import tempfile
@@ -180,12 +179,12 @@ def test_backup_exhaust(self):
             with node.backup(xlog_method='fetch') as backup:
 
                 # exhaust backup by creating new node
-                with backup.spawn_primary('node1') as node1:
+                with backup.spawn_primary('node1'):
                     pass
 
                 # now let's try to create one more node
                 with self.assertRaises(BackupException):
-                    with backup.spawn_primary('node2') as node2:
+                    with backup.spawn_primary('node2'):
                         pass
 
     def test_users(self):
@@ -253,7 +252,6 @@ def test_version_management(self):
 
     def test_configure(self):
         # set global if it wasn't set
-        pg_config = get_pg_config()
         configure_testgres(cache_initdb=True, cache_pg_config=True)
 
         # check that is the same instance
