Commita899319

committed

Make dbname optional in psql commands

1 parent18691ce commita899319Copy full SHA for a899319

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,7 @@ def cleanup(self, max_attempts=3):`
`853`	`853`
`854`	`854`	`returnself`
`855`	`855`
`856`		`-defpsql(self,dbname,query=None,filename=None,username=None):`
	`856`	`+defpsql(self,query,filename=None,username=None,dbname='postgres'):`
`857`	`857`	`"""`
`858`	`858`	`Execute a query using psql.`
`859`	`859`
`@@ -896,7 +896,7 @@ def psql(self, dbname, query=None, filename=None, username=None):`
`896`	`896`	`out,err=process.communicate()`
`897`	`897`	`returnprocess.returncode,out,err`
`898`	`898`
`899`		`-defsafe_psql(self,dbname,query,username=None):`
	`899`	`+defsafe_psql(self,query,username=None,dbname='postgres'):`
`900`	`900`	`"""`
`901`	`901`	`Execute a query using psql.`
`902`	`902`
`@@ -909,7 +909,7 @@ def safe_psql(self, dbname, query, username=None):`
`909`	`909`	`psql's output as str.`
`910`	`910`	`"""`
`911`	`911`
`912`		`-ret,out,err=self.psql(dbname,query,username=username)`
	`912`	`+ret,out,err=self.psql(query,username=username,dbname=dbname)`
`913`	`913`	`ifret:`
`914`	`914`	`err=''ifnoterrelseerr.decode('utf-8')`
`915`	`915`	`raiseQueryException(err)`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`# coding: utf-8`
`3`	`3`
`4`	`4`	`importos`
`5`		`-importre`
`6`	`5`	`importsix`
`7`	`6`	`importsubprocess`
`8`	`7`	`importtempfile`
`@@ -180,12 +179,12 @@ def test_backup_exhaust(self):`
`180`	`179`	`withnode.backup(xlog_method='fetch')asbackup:`
`181`	`180`
`182`	`181`	`# exhaust backup by creating new node`
`183`		`-withbackup.spawn_primary('node1')asnode1:`
	`182`	`+withbackup.spawn_primary('node1'):`
`184`	`183`	`pass`
`185`	`184`
`186`	`185`	`# now let's try to create one more node`
`187`	`186`	`withself.assertRaises(BackupException):`
`188`		`-withbackup.spawn_primary('node2')asnode2:`
	`187`	`+withbackup.spawn_primary('node2'):`
`189`	`188`	`pass`
`190`	`189`
`191`	`190`	`deftest_users(self):`
`@@ -253,7 +252,6 @@ def test_version_management(self):`
`253`	`252`
`254`	`253`	`deftest_configure(self):`
`255`	`254`	`# set global if it wasn't set`
`256`		`-pg_config=get_pg_config()`
`257`	`255`	`configure_testgres(cache_initdb=True,cache_pg_config=True)`
`258`	`256`
`259`	`257`	`# check that is the same instance`

Comments

(0)