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

Commit955d536

Browse files
author
Artur Zakirov
committed
Fix tests. Some tests didn't pass.
1 parent6485b9f commit955d536

File tree

1 file changed

+49
-37
lines changed

1 file changed

+49
-37
lines changed

‎tests/restore_test.py

Lines changed: 49 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ def test_restore_to_latest_1(self):
3030
backup_log.write(self.backup_pb(node,options=["--verbose"]))
3131

3232
node.stop({"-m":"immediate"})
33+
node.cleanup()
3334

34-
withopen(path.join(node.logs_dir,"restore_1.log"),"wb")asrestore_log:
35-
restore_log.write(self.restore_pb(node,options=["-j","4","--verbose"]))
35+
self.assertIn(six.b("INFO: restore complete"),
36+
self.restore_pb(node,options=["-j","4","--verbose"]))
3637

3738
node.start({"-t":"600"})
3839

@@ -61,9 +62,10 @@ def test_restore_to_latest_2(self):
6162
before=node.execute("postgres","SELECT * FROM pgbench_branches")
6263

6364
node.stop({"-m":"immediate"})
65+
node.cleanup()
6466

65-
withopen(path.join(node.logs_dir,"restore_1.log"),"wb")asrestore_log:
66-
restore_log.write(self.restore_pb(node,options=["-j","4","--verbose"]))
67+
self.assertIn(six.b("INFO: restore complete"),
68+
self.restore_pb(node,options=["-j","4","--verbose"]));
6769

6870
node.start({"-t":"600"})
6971

@@ -86,9 +88,10 @@ def test_restore_to_timeline_3(self):
8688

8789
target_tli=int(self.get_control_data(node)[six.b("Latest checkpoint's TimeLineID")])
8890
node.stop({"-m":"immediate"})
91+
node.cleanup()
8992

90-
withopen(path.join(node.logs_dir,"restore_1.log"),"wb")asrestore_log:
91-
restore_log.write(self.restore_pb(node,options=["-j","4","--verbose"]))
93+
self.assertIn(six.b("INFO: restore complete"),
94+
self.restore_pb(node,options=["-j","4","--verbose"]))
9295

9396
node.start({"-t":"600"})
9497

@@ -100,12 +103,11 @@ def test_restore_to_timeline_3(self):
100103
backup_log.write(self.backup_pb(node,backup_type="full",options=["--verbose"]))
101104

102105
node.stop({"-m":"immediate"})
106+
node.cleanup()
103107

104-
withopen(path.join(node.logs_dir,"restore_2.log"),"wb")asrestore_log:
105-
restore_log.write(self.restore_pb(
106-
node,
107-
options=["-j","4","--verbose","--timeline=%i"%target_tli]
108-
))
108+
self.assertIn(six.b("INFO: restore complete"),
109+
self.restore_pb(node,
110+
options=["-j","4","--verbose","--timeline=%i"%target_tli]))
109111

110112
recovery_target_timeline=self.get_recovery_conf(node)["recovery_target_timeline"]
111113
self.assertEqual(int(recovery_target_timeline),target_tli)
@@ -135,12 +137,11 @@ def test_restore_to_time_4(self):
135137
pgbench.stdout.close()
136138

137139
node.stop({"-m":"immediate"})
140+
node.cleanup()
138141

139-
withopen(path.join(node.logs_dir,"restore_1.log"),"wb")asrestore_log:
140-
restore_log.write(self.restore_pb(
141-
node,
142-
options=["-j","4","--verbose",'--time="%s"'%target_time]
143-
))
142+
self.assertIn(six.b("INFO: restore complete"),
143+
self.restore_pb(node,
144+
options=["-j","4","--verbose",'--time="%s"'%target_time]))
144145

145146
node.start({"-t":"600"})
146147

@@ -182,12 +183,11 @@ def test_restore_to_xid_5(self):
182183
node.execute("postgres","SELECT pg_switch_xlog()")
183184

184185
node.stop({"-m":"fast"})
186+
node.cleanup()
185187

186-
withopen(path.join(node.logs_dir,"restore_1.log"),"wb")asrestore_log:
187-
restore_log.write(self.restore_pb(
188-
node,
189-
options=["-j","4","--verbose",'--xid=%s'%target_xid]
190-
))
188+
self.assertIn(six.b("INFO: restore complete"),
189+
self.restore_pb(node,
190+
options=["-j","4","--verbose",'--xid=%s'%target_xid]))
191191

192192
node.start({"-t":"600"})
193193

@@ -224,9 +224,10 @@ def test_restore_full_ptrack_6(self):
224224
before=node.execute("postgres","SELECT * FROM pgbench_branches")
225225

226226
node.stop({"-m":"immediate"})
227+
node.cleanup()
227228

228-
withopen(path.join(node.logs_dir,"restore_1.log"),"wb")asrestore_log:
229-
restore_log.write(self.restore_pb(node,options=["-j","4","--verbose"]))
229+
self.assertIn(six.b("INFO: restore complete"),
230+
self.restore_pb(node,options=["-j","4","--verbose"]))
230231

231232
node.start({"-t":"600"})
232233

@@ -270,9 +271,10 @@ def test_restore_full_ptrack_ptrack_7(self):
270271
before=node.execute("postgres","SELECT * FROM pgbench_branches")
271272

272273
node.stop({"-m":"immediate"})
274+
node.cleanup()
273275

274-
withopen(path.join(node.logs_dir,"restore_1.log"),"wb")asrestore_log:
275-
restore_log.write(self.restore_pb(node,options=["-j","4","--verbose"]))
276+
self.assertIn(six.b("INFO: restore complete"),
277+
self.restore_pb(node,options=["-j","4","--verbose"]))
276278

277279
node.start({"-t":"600"})
278280

@@ -293,7 +295,10 @@ def test_restore_full_ptrack_stream_8(self):
293295
self.skipTest("ptrack not supported")
294296
return
295297

298+
node.append_conf("pg_hba.conf","local replication all trust")
299+
node.append_conf("pg_hba.conf","host replication all 127.0.0.1/32 trust")
296300
node.append_conf("postgresql.conf","ptrack_enable = on")
301+
node.append_conf("postgresql.conf","max_wal_senders = 1")
297302
node.restart()
298303

299304
withopen(path.join(node.logs_dir,"backup_1.log"),"wb")asbackup_log:
@@ -309,9 +314,10 @@ def test_restore_full_ptrack_stream_8(self):
309314
before=node.execute("postgres","SELECT * FROM pgbench_branches")
310315

311316
node.stop({"-m":"immediate"})
317+
node.cleanup()
312318

313-
withopen(path.join(node.logs_dir,"restore_1.log"),"wb")asrestore_log:
314-
restore_log.write(self.restore_pb(node,options=["-j","4","--verbose"]))
319+
self.assertIn(six.b("INFO: restore complete"),
320+
self.restore_pb(node,options=["-j","4","--verbose"]))
315321

316322
node.start({"-t":"600"})
317323

@@ -333,7 +339,10 @@ def test_restore_full_ptrack_under_load_9(self):
333339
self.skipTest("ptrack not supported")
334340
return
335341

342+
node.append_conf("pg_hba.conf","local replication all trust")
343+
node.append_conf("pg_hba.conf","host replication all 127.0.0.1/32 trust")
336344
node.append_conf("postgresql.conf","ptrack_enable = on")
345+
node.append_conf("postgresql.conf","max_wal_senders = 1")
337346
node.restart()
338347

339348
withopen(path.join(node.logs_dir,"backup_1.log"),"wb")asbackup_log:
@@ -358,11 +367,12 @@ def test_restore_full_ptrack_under_load_9(self):
358367

359368
self.assertEqual(bbalance,delta)
360369
node.stop({"-m":"immediate"})
370+
node.cleanup()
361371

362372
self.wrong_wal_clean(node,wal_segment_size)
363373

364-
withopen(path.join(node.logs_dir,"restore_1.log"),"wb")asrestore_log:
365-
restore_log.write(self.restore_pb(node,options=["-j","4","--verbose"]))
374+
self.assertIn(six.b("INFO: restore complete"),
375+
self.restore_pb(node,options=["-j","4","--verbose"]))
366376

367377
node.start({"-t":"600"})
368378

@@ -386,7 +396,10 @@ def test_restore_full_under_load_ptrack_10(self):
386396
self.skipTest("ptrack not supported")
387397
return
388398

399+
node.append_conf("pg_hba.conf","local replication all trust")
400+
node.append_conf("pg_hba.conf","host replication all 127.0.0.1/32 trust")
389401
node.append_conf("postgresql.conf","ptrack_enable = on")
402+
node.append_conf("postgresql.conf","max_wal_senders = 1")
390403
node.restart()
391404

392405
pgbench=node.pgbench(
@@ -412,10 +425,11 @@ def test_restore_full_under_load_ptrack_10(self):
412425
self.assertEqual(bbalance,delta)
413426

414427
node.stop({"-m":"immediate"})
428+
node.cleanup()
415429
self.wrong_wal_clean(node,wal_segment_size)
416430

417-
withopen(path.join(node.logs_dir,"restore_1.log"),"wb")asrestore_log:
418-
restore_log.write(self.restore_pb(node,options=["-j","4","--verbose"]))
431+
self.assertIn(six.b("INFO: restore complete"),
432+
self.restore_pb(node,options=["-j","4","--verbose"]))
419433

420434
node.start({"-t":"600"})
421435

@@ -459,17 +473,15 @@ def test_restore_to_xid_inclusive_11(self):
459473
node.execute("postgres","SELECT pg_switch_xlog()")
460474

461475
node.stop({"-m":"fast"})
476+
node.cleanup()
462477

463-
withopen(path.join(node.logs_dir,"restore_1.log"),"wb")asrestore_log:
464-
restore_log.write(self.restore_pb(
465-
node,
478+
self.assertIn(six.b("INFO: restore complete"),
479+
self.restore_pb(node,
466480
options=[
467481
"-j","4",
468482
"--verbose",
469483
'--xid=%s'%target_xid,
470-
"--inclusive=false"
471-
]
472-
))
484+
"--inclusive=false"]))
473485

474486
node.start({"-t":"600"})
475487

0 commit comments

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