Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit138c6cc

Browse files
committed
Added test for Publication.add_tables()
1 parentf48623b commit138c6cc

File tree

2 files changed

+26
-24
lines changed

2 files changed

+26
-24
lines changed

‎testgres/pubsub.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ def __init__(self, name, node, tables=None, dbname=None, username=None):
2727
# create publication in database
2828
t="table "+", ".join(tables)iftableselse"all tables"
2929
query="create publication {} for {}"
30-
node.safe_psql(query.format(name,t),
31-
dbname=dbname,
32-
username=username)
30+
node.safe_psql(query.format(name,t),dbname=dbname,username=username)
3331

3432
defdrop(self,dbname=None,username=None):
3533
"""
3634
Drop publication
3735
"""
38-
self.node.safe_psql("drop publication {}".format(self.name),
39-
dbname=dbname,username=username)
36+
self.node.safe_psql(
37+
"drop publication {}".format(self.name),
38+
dbname=dbname,
39+
username=username)
4040

4141
defadd_tables(self,tables,dbname=None,username=None):
4242
"""
@@ -49,9 +49,10 @@ def add_tables(self, tables, dbname=None, username=None):
4949
raiseValueError("Tables list is empty")
5050

5151
query="alter publication {} add table {}"
52-
self.node.safe_psql(query.format(self.name,", ".join(tables)),
53-
dbname=dbnameorself.dbname,
54-
username=usernameorself.username)
52+
self.node.safe_psql(
53+
query.format(self.name,", ".join(tables)),
54+
dbname=dbnameorself.dbname,
55+
username=usernameorself.username)
5556

5657

5758
classSubscription(object):
@@ -87,8 +88,8 @@ def __init__(self,
8788
}
8889

8990
query= (
90-
"create subscription {} connection '{}' publication {}"
91-
).format(name,options_string(**conninfo),self.pub.name)
91+
"create subscription {} connection '{}' publication {}").format(
92+
name,options_string(**conninfo),self.pub.name)
9293

9394
# additional parameters
9495
ifkwargs:
@@ -101,34 +102,33 @@ def disable(self, dbname=None, username=None):
101102
Disables the running subscription.
102103
"""
103104
query="alter subscription {} disable"
104-
self.node.safe_psql(query.format(self.name),
105-
dbname=None,
106-
username=None)
105+
self.node.safe_psql(query.format(self.name),dbname=None,username=None)
107106

108107
defenable(self,dbname=None,username=None):
109108
"""
110109
Enables the previously disabled subscription.
111110
"""
112111
query="alter subscription {} enable"
113-
self.node.safe_psql(query.format(self.name),
114-
dbname=None,
115-
username=None)
112+
self.node.safe_psql(query.format(self.name),dbname=None,username=None)
116113

117114
defrefresh(self,copy_data=True,dbname=None,username=None):
118115
"""
119116
Disables the running subscription.
120117
"""
121118
query="alter subscription {} refresh publication with (copy_data={})"
122-
self.node.safe_psql(query.format(self.name,copy_data),
123-
dbname=dbname,
124-
username=username)
119+
self.node.safe_psql(
120+
query.format(self.name,copy_data),
121+
dbname=dbname,
122+
username=username)
125123

126124
defdrop(self,dbname=None,username=None):
127125
"""
128126
Drops subscription
129127
"""
130-
self.node.safe_psql("drop subscription {}".format(self.name),
131-
dbname=dbname,username=username)
128+
self.node.safe_psql(
129+
"drop subscription {}".format(self.name),
130+
dbname=dbname,
131+
username=username)
132132

133133
defcatchup(self,username=None):
134134
"""
@@ -139,8 +139,8 @@ def catchup(self, username=None):
139139
"""
140140
query= (
141141
"select pg_current_wal_lsn() - replay_lsn = 0 "
142-
"from pg_stat_replication where application_name = '{}'"
143-
).format(self.name)
142+
"from pg_stat_replication where application_name = '{}'").format(
143+
self.name)
144144

145145
try:
146146
# wait until this LSN reaches subscriber

‎tests/test_simple.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ def test_logical_replication(self):
423423

424424
# Add new tables. Since we added "all tables" to publication
425425
# (default behaviour of publish() method) we don't need
426-
# to explicitely perform pub.add_table()
426+
# to explicitely perform pub.add_tables()
427427
create_table='create table test2 (c char)'
428428
node1.safe_psql(create_table)
429429
node2.safe_psql(create_table)
@@ -450,6 +450,8 @@ def test_logical_replication(self):
450450
self.assertListEqual(res, [(1,1), (2,2), (3,3), (4,4)])
451451

452452
# explicitely add table
453+
withself.assertRaises(ValueError):
454+
pub.add_tables([])# fail
453455
pub.add_tables(['test2'])
454456
node1.safe_psql('insert into test2 values (\'c\')')
455457
sub.catchup()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp