Movatterモバイル変換

Skip to content

postgrespro/testgresPublic

NotificationsYou must be signed in to change notification settings
Fork35
Star147

Commitea5409f

Burus

committed

fix travis jobs

2 parentsf2645d7 +4024049 commitea5409fCopy full SHA for ea5409f

File tree

13 files changed

+94

-101

lines changed

13 files changed

+94

-101

lines changed

`‎.travis.yml`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-sudo:required`
	`1`	`+os:linux`
	`2`	`+`
	`3`	`+dist:bionic`
`2`	`4`
`3`	`5`	`language:python`
`4`	`6`
`@@ -18,6 +20,7 @@ notifications:`
`18`	`20`	`on_failure:always`
`19`	`21`
`20`	`22`	`env:`
	`23`	`+`
`21`	`24`	`-PYTHON_VERSION=2 PG_VERSION=10`
`22`	`25`	`-PYTHON_VERSION=2 PG_VERSION=11`
`23`	`26`	`-PYTHON_VERSION=2 PG_VERSION=12`

`‎setup.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`readme=f.read()`
`22`	`22`
`23`	`23`	`setup(`
`24`		`-version='1.8.4',`
	`24`	`+version='1.8.5',`
`25`	`25`	`name='testgres',`
`26`	`26`	`packages=['testgres'],`
`27`	`27`	`description='Testing utility for PostgreSQL and its extensions',`

`‎testgres/backup.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ class NodeBackup(object):`
`29`	`29`	`"""`
`30`	`30`	`Smart object responsible for backups`
`31`	`31`	`"""`
`32`		`-`
`33`	`32`	`@property`
`34`	`33`	`deflog_file(self):`
`35`	`34`	`returnos.path.join(self.base_dir,BACKUP_LOG_FILE)`

`‎testgres/cache.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ def cached_initdb(data_dir, logfile=None, params=None):`
`25`	`25`	`"""`
`26`	`26`	`Perform initdb or use cached node files.`
`27`	`27`	`"""`
`28`		`-`
`29`	`28`	`defcall_initdb(initdb_dir,log=None):`
`30`	`29`	`try:`
`31`	`30`	`_params= [get_bin_path("initdb"),"-D",initdb_dir,"-N"]`

`‎testgres/config.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ class GlobalConfig(object):`
`43`	`43`
`44`	`44`	`_cached_initdb_dir=None`
`45`	`45`	`""" underlying class attribute for cached_initdb_dir property """`
`46`		`-`
`47`	`46`	`@property`
`48`	`47`	`defcached_initdb_dir(self):`
`49`	`48`	`""" path to a temp directory for cached initdb. """`

`‎testgres/connection.py`

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ class NodeConnection(object):`
`28`	`28`	`"""`
`29`	`29`	`Transaction wrapper returned by Node`
`30`	`30`	`"""`
`31`		`-`
`32`	`31`	`def__init__(self,`
`33`	`32`	`node,`
`34`	`33`	`dbname=None,`
`@@ -42,12 +41,11 @@ def __init__(self,`
`42`	`41`
`43`	`42`	`self._node=node`
`44`	`43`
`45`		`-self._connection=pglib.connect(`
`46`		`-database=dbname,`
`47`		`-user=username,`
`48`		`-password=password,`
`49`		`-host=node.host,`
`50`		`-port=node.port)`
	`44`	`+self._connection=pglib.connect(database=dbname,`
	`45`	`+user=username,`
	`46`	`+password=password,`
	`47`	`+host=node.host,`
	`48`	`+port=node.port)`
`51`	`49`
`52`	`50`	`self._connection.autocommit=autocommit`
`53`	`51`	`self._cursor=self.connection.cursor()`

`‎testgres/decorators.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ def method_decorator(decorator):`
`50`	`50`	`"""`
`51`	`51`	`Convert a function decorator into a method decorator.`
`52`	`52`	`"""`
`53`		`-`
`54`	`53`	`def_dec(func):`
`55`	`54`	`def_wrapper(self,args,*kwargs):`
`56`	`55`	`@decorator`

`‎testgres/logger.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ class TestgresLogger(threading.Thread):`
`10`	`10`	`"""`
`11`	`11`	`Helper class to implement reading from log files.`
`12`	`12`	`"""`
`13`		`-`
`14`	`13`	`def__init__(self,node_name,log_file_name):`
`15`	`14`	`threading.Thread.__init__(self)`
`16`	`15`

`‎testgres/node.py`

Lines changed: 34 additions & 33 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,11 @@`
`6`	`6`	`importsubprocess`
`7`	`7`	`importtime`
`8`	`8`
`9`		`-fromcollectionsimportIterable`
	`9`	`+try:`
	`10`	`+fromcollections.abcimportIterable`
	`11`	`+exceptImportError:`
	`12`	`+fromcollectionsimportIterable`
	`13`	`+`
`10`	`14`	`fromshutilimportrmtree`
`11`	`15`	`fromsiximportraise_from,iteritems,text_type`
`12`	`16`	`fromtempfileimportmkstemp,mkdtemp`
`@@ -91,7 +95,6 @@ class ProcessProxy(object):`
`91`	`95`	`process: wrapped psutill.Process object`
`92`	`96`	`ptype: instance of ProcessType`
`93`	`97`	`"""`
`94`		`-`
`95`	`98`	`def__init__(self,process,ptype=None):`
`96`	`99`	`self.process=process`
`97`	`100`	`self.ptype=ptypeorProcessType.from_process(process)`
`@@ -196,7 +199,6 @@ def auxiliary_processes(self):`
`196`	`199`	`Returns a list of auxiliary processes.`
`197`	`200`	Each process is represented by :class:`.ProcessProxy` object.
`198`	`201`	`"""`
`199`		`-`
`200`	`202`	`defis_aux(process):`
`201`	`203`	`returnprocess.ptype!=ProcessType.Unknown`
`202`	`204`
`@@ -430,10 +432,9 @@ def init(self, initdb_params=None, **kwargs):`
`430`	`432`	`"""`
`431`	`433`
`432`	`434`	`# initialize this PostgreSQL node`
`433`		`-cached_initdb(`
`434`		`-data_dir=self.data_dir,`
`435`		`-logfile=self.utils_log_file,`
`436`		`-params=initdb_params)`
	`435`	`+cached_initdb(data_dir=self.data_dir,`
	`436`	`+logfile=self.utils_log_file,`
	`437`	`+params=initdb_params)`
`437`	`438`
`438`	`439`	`# initialize default config files`
`439`	`440`	`self.default_conf(**kwargs)`
`@@ -480,8 +481,8 @@ def default_conf(self,`
`480`	`481`	`ifallow_streaming:`
`481`	`482`	`# get auth method for host or local users`
`482`	`483`	`defget_auth_method(t):`
`483`		`-returnnext((s.split()[-1]forsinlines`
`484`		`-ifs.startswith(t)),'trust')`
	`484`	`+returnnext((s.split()[-1]`
	`485`	`+forsinlinesifs.startswith(t)),'trust')`
`485`	`486`
`486`	`487`	`# get auth methods`
`487`	`488`	`auth_local=get_auth_method('local')`
`@@ -760,12 +761,11 @@ def promote(self, dbname=None, username=None):`
`760`	`761`	`ifself._pg_version<'10':`
`761`	`762`	`check_query="SELECT pg_is_in_recovery()"`
`762`	`763`
`763`		`-self.poll_query_until(`
`764`		`-query=check_query,`
`765`		`-expected=False,`
`766`		`-dbname=dbname,`
`767`		`-username=username,`
`768`		`-max_attempts=0)# infinite`
	`764`	`+self.poll_query_until(query=check_query,`
	`765`	`+expected=False,`
	`766`	`+dbname=dbname,`
	`767`	`+username=username,`
	`768`	`+max_attempts=0)# infinite`
`769`	`769`
`770`	`770`	`# node becomes master itself`
`771`	`771`	`self._master=None`
`@@ -884,11 +884,10 @@ def psql(self,`
`884`	`884`	`psql_params.append(dbname)`
`885`	`885`
`886`	`886`	`# start psql process`
`887`		`-process=subprocess.Popen(`
`888`		`-psql_params,`
`889`		`-stdin=subprocess.PIPE,`
`890`		`-stdout=subprocess.PIPE,`
`891`		`-stderr=subprocess.PIPE)`
	`887`	`+process=subprocess.Popen(psql_params,`
	`888`	`+stdin=subprocess.PIPE,`
	`889`	`+stdout=subprocess.PIPE,`
	`890`	`+stderr=subprocess.PIPE)`
`892`	`891`
`893`	`892`	`# wait until it finishes and get stdout and stderr`
`894`	`893`	`out,err=process.communicate(input=input)`
`@@ -1043,11 +1042,10 @@ def poll_query_until(self,`
`1043`	`1042`	`attempts=0`
`1044`	`1043`	`whilemax_attempts==0orattempts<max_attempts:`
`1045`	`1044`	`try:`
`1046`		`-res=self.execute(`
`1047`		`-dbname=dbname,`
`1048`		`-query=query,`
`1049`		`-username=username,`
`1050`		`-commit=commit)`
	`1045`	`+res=self.execute(dbname=dbname,`
	`1046`	`+query=query,`
	`1047`	`+username=username,`
	`1048`	`+commit=commit)`
`1051`	`1049`
`1052`	`1050`	`ifexpectedisNoneandresisNone:`
`1053`	`1051`	`return# done`
`@@ -1165,8 +1163,8 @@ def set_synchronous_standbys(self, standbys):`
`1165`	`1163`	`standbys=First(1,standbys)`
`1166`	`1164`	`else:`
`1167`	`1165`	`ifisinstance(standbys,Iterable):`
`1168`		`-standbys=u", ".join(`
`1169`		`-u"\"{}\"".format(r.name)forrinstandbys)`
	`1166`	`+standbys=u", ".join(u"\"{}\"".format(r.name)`
	`1167`	`+forrinstandbys)`
`1170`	`1168`	`else:`
`1171`	`1169`	`raiseTestgresException("Feature isn't supported in "`
`1172`	`1170`	`"Postgres 9.5 and below")`
`@@ -1195,11 +1193,10 @@ def catchup(self, dbname=None, username=None):`
`1195`	`1193`	`username=username)[0][0]# yapf: disable`
`1196`	`1194`
`1197`	`1195`	`# wait until this LSN reaches replica`
`1198`		`-self.poll_query_until(`
`1199`		`-query=wait_lsn.format(lsn),`
`1200`		`-dbname=dbname,`
`1201`		`-username=username,`
`1202`		`-max_attempts=0)# infinite`
	`1196`	`+self.poll_query_until(query=wait_lsn.format(lsn),`
	`1197`	`+dbname=dbname,`
	`1198`	`+username=username,`
	`1199`	`+max_attempts=0)# infinite`
`1203`	`1200`	`exceptExceptionase:`
`1204`	`1201`	`raise_from(CatchUpException("Failed to catch up",poll_lsn),e)`
`1205`	`1202`
`@@ -1215,7 +1212,11 @@ def publish(self, name, **kwargs):`
`1215`	`1212`	`"""`
`1216`	`1213`	`returnPublication(name=name,node=self,**kwargs)`
`1217`	`1214`
`1218`		`-defsubscribe(self,publication,name,dbname=None,username=None,`
	`1215`	`+defsubscribe(self,`
	`1216`	`+publication,`
	`1217`	`+name,`
	`1218`	`+dbname=None,`
	`1219`	`+username=None,`
`1219`	`1220`	`**params):`
`1220`	`1221`	`"""`
`1221`	`1222`	`Create subscription for logical replication`

`‎testgres/pubsub.py`

Lines changed: 15 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,10 +77,9 @@ def drop(self, dbname=None, username=None):`
`77`	`77`	`"""`
`78`	`78`	`Drop publication`
`79`	`79`	`"""`
`80`		`-self.node.execute(`
`81`		`-"drop publication {}".format(self.name),`
`82`		`-dbname=dbname,`
`83`		`-username=username)`
	`80`	`+self.node.execute("drop publication {}".format(self.name),`
	`81`	`+dbname=dbname,`
	`82`	`+username=username)`
`84`	`83`
`85`	`84`	`defadd_tables(self,tables,dbname=None,username=None):`
`86`	`85`	`"""`
`@@ -94,10 +93,9 @@ def add_tables(self, tables, dbname=None, username=None):`
`94`	`93`	`raiseValueError("Tables list is empty")`
`95`	`94`
`96`	`95`	`query="alter publication {} add table {}"`
`97`		`-self.node.execute(`
`98`		`-query.format(self.name,", ".join(tables)),`
`99`		`-dbname=dbnameorself.dbname,`
`100`		`-username=usernameorself.username)`
	`96`	`+self.node.execute(query.format(self.name,", ".join(tables)),`
	`97`	`+dbname=dbnameorself.dbname,`
	`98`	`+username=usernameorself.username)`
`101`	`99`
`102`	`100`
`103`	`101`	`classSubscription(object):`
`@@ -165,19 +163,17 @@ def refresh(self, copy_data=True, dbname=None, username=None):`
`165`	`163`	`Disables the running subscription.`
`166`	`164`	`"""`
`167`	`165`	`query="alter subscription {} refresh publication with (copy_data={})"`
`168`		`-self.node.execute(`
`169`		`-query.format(self.name,copy_data),`
`170`		`-dbname=dbname,`
`171`		`-username=username)`
	`166`	`+self.node.execute(query.format(self.name,copy_data),`
	`167`	`+dbname=dbname,`
	`168`	`+username=username)`
`172`	`169`
`173`	`170`	`defdrop(self,dbname=None,username=None):`
`174`	`171`	`"""`
`175`	`172`	`Drops subscription`
`176`	`173`	`"""`
`177`		`-self.node.execute(`
`178`		`-"drop subscription {}".format(self.name),`
`179`		`-dbname=dbname,`
`180`		`-username=username)`
	`174`	`+self.node.execute("drop subscription {}".format(self.name),`
	`175`	`+dbname=dbname,`
	`176`	`+username=username)`
`181`	`177`
`182`	`178`	`defcatchup(self,username=None):`
`183`	`179`	`"""`
`@@ -191,7 +187,9 @@ def catchup(self, username=None):`
`191`	`187`	`dbname=None,`
`192`	`188`	`username=None)[0][0]# yapf: disable`
`193`	`189`	`# create dummy xact, as LR replicates only on commit.`
`194`		`-self.pub.node.execute(query="select txid_current()",dbname=None,username=None)`
	`190`	`+self.pub.node.execute(query="select txid_current()",`
	`191`	`+dbname=None,`
	`192`	`+username=None)`
`195`	`193`	`query="""`
`196`	`194`	`select '{}'::pg_lsn - replay_lsn <= 0`
`197`	`195`	`from pg_catalog.pg_stat_replication where application_name = '{}'`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp