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

Commit9619c43

Browse files
committed
Try fix blinking some tests.
1 parent1cf7150 commit9619c43

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

‎tests/pb_lib.py‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
importos
2-
fromosimportpath
2+
fromosimportpath,listdir
33
importsubprocess
44
importshutil
55
importsix
@@ -206,3 +206,19 @@ def get_recovery_conf(self, node):
206206
out_dict[key.strip()]=value.strip(" '").replace("'\n","")
207207

208208
returnout_dict
209+
210+
defwrong_wal_clean(self,node,wal_size):
211+
wals_dir=path.join(self.backup_dir(node),"wal")
212+
wals= [fforfinlistdir(wals_dir)ifpath.isfile(path.join(wals_dir,f))]
213+
wals.sort()
214+
file_path=path.join(wals_dir,wals[-1])
215+
ifpath.getsize(file_path)!=wal_size:
216+
os.remove(file_path)
217+
218+
defguc_wal_segment_size(self,node):
219+
var=node.execute("postgres","select setting from pg_settings where name = 'wal_segment_size'")
220+
returnint(var[0][0])*self.guc_wal_block_size(node)
221+
222+
defguc_wal_block_size(self,node):
223+
var=node.execute("postgres","select setting from pg_settings where name = 'wal_block_size'")
224+
returnint(var[0][0])

‎tests/restore_test.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ def test_restore_full_ptrack_under_load_9(self):
325325
node=self.make_bnode('restore_full_ptrack_under_load_9',base_dir="tmp_dirs/restore/full_ptrack_under_load_9")
326326
node.start()
327327
self.assertEqual(self.init_pb(node),six.b(""))
328+
wal_segment_size=self.guc_wal_segment_size(node)
328329
node.pgbench_init(scale=2)
329330
is_ptrack=node.execute("postgres","SELECT proname FROM pg_proc WHERE proname='pg_ptrack_clear'")
330331
ifnotis_ptrack:
@@ -356,9 +357,10 @@ def test_restore_full_ptrack_under_load_9(self):
356357
delta=node.execute("postgres","SELECT sum(delta) FROM pgbench_history")
357358

358359
self.assertEqual(bbalance,delta)
359-
360360
node.stop({"-m":"immediate"})
361361

362+
self.wrong_wal_clean(node,wal_segment_size)
363+
362364
withopen(path.join(node.logs_dir,"restore_1.log"),"wb")asrestore_log:
363365
restore_log.write(self.restore_pb(node,options=["-j","4","--verbose"]))
364366

@@ -376,6 +378,7 @@ def test_restore_full_under_load_ptrack_10(self):
376378
node=self.make_bnode('estore_full_under_load_ptrack_10',base_dir="tmp_dirs/restore/full_under_load_ptrack_10")
377379
node.start()
378380
self.assertEqual(self.init_pb(node),six.b(""))
381+
wal_segment_size=self.guc_wal_segment_size(node)
379382
node.pgbench_init(scale=2)
380383
is_ptrack=node.execute("postgres","SELECT proname FROM pg_proc WHERE proname='pg_ptrack_clear'")
381384
ifnotis_ptrack:
@@ -409,6 +412,7 @@ def test_restore_full_under_load_ptrack_10(self):
409412
self.assertEqual(bbalance,delta)
410413

411414
node.stop({"-m":"immediate"})
415+
self.wrong_wal_clean(node,wal_segment_size)
412416

413417
withopen(path.join(node.logs_dir,"restore_1.log"),"wb")asrestore_log:
414418
restore_log.write(self.restore_pb(node,options=["-j","4","--verbose"]))

0 commit comments

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