Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 20f055f

Browse files
stalkergstalkerg
committed
Move from pg_ctl to .stop/.start from new testgres.
1 parent 9d17c12 commit 20f055f

File tree

2 files changed

+25
-126
lines changed

2 files changed

+25
-126
lines changed

‎tests/restore_test.py

Lines changed: 24 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,12 @@ def test_restore_to_latest_1(self):
2929
with open(path.join(node.logs_dir, "backup_1.log"), "wb") as backup_log:
3030
backup_log.write(self.backup_pb(node, options=["--verbose"]))
3131

32-
node.pg_ctl("stop", {
33-
"-D": node.data_dir,
34-
"-w": None,
35-
"-m": "immediate"
36-
})
32+
node.stop({"-m": "immediate"})
3733

3834
with open(path.join(node.logs_dir, "restore_1.log"), "wb") as restore_log:
3935
restore_log.write(self.restore_pb(node, options=["-j", "4", "--verbose"]))
4036

41-
node.pg_ctl("start", {
42-
"-D": node.data_dir,
43-
"-w": None,
44-
"-t": "600"
45-
})
37+
node.start({"-t": "600"})
4638

4739
after = node.execute("postgres", "SELECT * FROM pgbench_branches")
4840
self.assertEqual(before, after)
@@ -68,20 +60,12 @@ def test_restore_to_latest_2(self):
6860

6961
before = node.execute("postgres", "SELECT * FROM pgbench_branches")
7062

71-
node.pg_ctl("stop", {
72-
"-D": node.data_dir,
73-
"-w": None,
74-
"-m": "immediate"
75-
})
63+
node.stop({"-m": "immediate"})
7664

7765
with open(path.join(node.logs_dir, "restore_1.log"), "wb") as restore_log:
7866
restore_log.write(self.restore_pb(node, options=["-j", "4", "--verbose"]))
7967

80-
node.pg_ctl("start", {
81-
"-D": node.data_dir,
82-
"-w": None,
83-
"-t": "600"
84-
})
68+
node.start({"-t": "600"})
8569

8670
after = node.execute("postgres", "SELECT * FROM pgbench_branches")
8771
self.assertEqual(before, after)
@@ -101,20 +85,12 @@ def test_restore_to_timeline_3(self):
10185
backup_log.write(self.backup_pb(node, backup_type="full", options=["--verbose"]))
10286

10387
target_tli = int(self.get_control_data(node)[six.b("Latest checkpoint's TimeLineID")])
104-
node.pg_ctl("stop", {
105-
"-D": node.data_dir,
106-
"-w": None,
107-
"-m": "immediate"
108-
})
88+
node.stop({"-m": "immediate"})
10989

11090
with open(path.join(node.logs_dir, "restore_1.log"), "wb") as restore_log:
11191
restore_log.write(self.restore_pb(node, options=["-j", "4", "--verbose"]))
11292

113-
node.pg_ctl("start", {
114-
"-D": node.data_dir,
115-
"-w": None,
116-
"-t": "600"
117-
})
93+
node.start({"-t": "600"})
11894

11995
pgbench = node.pgbench(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
12096
pgbench.wait()
@@ -123,11 +99,7 @@ def test_restore_to_timeline_3(self):
12399
with open(path.join(node.logs_dir, "backup_2.log"), "wb") as backup_log:
124100
backup_log.write(self.backup_pb(node, backup_type="full", options=["--verbose"]))
125101

126-
node.pg_ctl("stop", {
127-
"-D": node.data_dir,
128-
"-w": None,
129-
"-m": "immediate"
130-
})
102+
node.stop({"-m": "immediate"})
131103

132104
with open(path.join(node.logs_dir, "restore_2.log"), "wb") as restore_log:
133105
restore_log.write(self.restore_pb(
@@ -138,11 +110,7 @@ def test_restore_to_timeline_3(self):
138110
recovery_target_timeline = self.get_recovery_conf(node)["recovery_target_timeline"]
139111
self.assertEqual(int(recovery_target_timeline), target_tli)
140112

141-
node.pg_ctl("start", {
142-
"-D": node.data_dir,
143-
"-w": None,
144-
"-t": "600"
145-
})
113+
node.start({"-t": "600"})
146114

147115
after = node.execute("postgres", "SELECT * FROM pgbench_branches")
148116
self.assertEqual(before, after)
@@ -166,23 +134,15 @@ def test_restore_to_time_4(self):
166134
pgbench.wait()
167135
pgbench.stdout.close()
168136

169-
node.pg_ctl("stop", {
170-
"-D": node.data_dir,
171-
"-w": None,
172-
"-m": "immediate"
173-
})
137+
node.stop({"-m": "immediate"})
174138

175139
with open(path.join(node.logs_dir, "restore_1.log"), "wb") as restore_log:
176140
restore_log.write(self.restore_pb(
177141
node,
178142
options=["-j", "4", "--verbose", '--time="%s"' % target_time]
179143
))
180144

181-
node.pg_ctl("start", {
182-
"-D": node.data_dir,
183-
"-w": None,
184-
"-t": "600"
185-
})
145+
node.start({"-t": "600"})
186146

187147
after = node.execute("postgres", "SELECT * FROM pgbench_branches")
188148
self.assertEqual(before, after)
@@ -221,23 +181,15 @@ def test_restore_to_xid_5(self):
221181
# been archived up to the xmin point saved earlier without that.
222182
node.execute("postgres", "SELECT pg_switch_xlog()")
223183

224-
node.pg_ctl("stop", {
225-
"-D": node.data_dir,
226-
"-w": None,
227-
"-m": "fast"
228-
})
184+
node.stop({"-m": "fast"})
229185

230186
with open(path.join(node.logs_dir, "restore_1.log"), "wb") as restore_log:
231187
restore_log.write(self.restore_pb(
232188
node,
233189
options=["-j", "4", "--verbose", '--xid=%s' % target_xid]
234190
))
235191

236-
node.pg_ctl("start", {
237-
"-D": node.data_dir,
238-
"-w": None,
239-
"-t": "600"
240-
})
192+
node.start({"-t": "600"})
241193

242194
after = node.execute("postgres", "SELECT * FROM pgbench_branches")
243195
self.assertEqual(before, after)
@@ -271,20 +223,12 @@ def test_restore_full_ptrack_6(self):
271223

272224
before = node.execute("postgres", "SELECT * FROM pgbench_branches")
273225

274-
node.pg_ctl("stop", {
275-
"-D": node.data_dir,
276-
"-w": None,
277-
"-m": "immediate"
278-
})
226+
node.stop({"-m": "immediate"})
279227

280228
with open(path.join(node.logs_dir, "restore_1.log"), "wb") as restore_log:
281229
restore_log.write(self.restore_pb(node, options=["-j", "4", "--verbose"]))
282230

283-
node.pg_ctl("start", {
284-
"-D": node.data_dir,
285-
"-w": None,
286-
"-t": "600"
287-
})
231+
node.start({"-t": "600"})
288232

289233
after = node.execute("postgres", "SELECT * FROM pgbench_branches")
290234
self.assertEqual(before, after)
@@ -325,20 +269,12 @@ def test_restore_full_ptrack_ptrack_7(self):
325269

326270
before = node.execute("postgres", "SELECT * FROM pgbench_branches")
327271

328-
node.pg_ctl("stop", {
329-
"-D": node.data_dir,
330-
"-w": None,
331-
"-m": "immediate"
332-
})
272+
node.stop({"-m": "immediate"})
333273

334274
with open(path.join(node.logs_dir, "restore_1.log"), "wb") as restore_log:
335275
restore_log.write(self.restore_pb(node, options=["-j", "4", "--verbose"]))
336276

337-
node.pg_ctl("start", {
338-
"-D": node.data_dir,
339-
"-w": None,
340-
"-t": "600"
341-
})
277+
node.start({"-t": "600"})
342278

343279
after = node.execute("postgres", "SELECT * FROM pgbench_branches")
344280
self.assertEqual(before, after)
@@ -372,20 +308,12 @@ def test_restore_full_ptrack_stream_8(self):
372308

373309
before = node.execute("postgres", "SELECT * FROM pgbench_branches")
374310

375-
node.pg_ctl("stop", {
376-
"-D": node.data_dir,
377-
"-w": None,
378-
"-m": "immediate"
379-
})
311+
node.stop({"-m": "immediate"})
380312

381313
with open(path.join(node.logs_dir, "restore_1.log"), "wb") as restore_log:
382314
restore_log.write(self.restore_pb(node, options=["-j", "4", "--verbose"]))
383315

384-
node.pg_ctl("start", {
385-
"-D": node.data_dir,
386-
"-w": None,
387-
"-t": "600"
388-
})
316+
node.start({"-t": "600"})
389317

390318
after = node.execute("postgres", "SELECT * FROM pgbench_branches")
391319
self.assertEqual(before, after)
@@ -429,20 +357,12 @@ def test_restore_full_ptrack_under_load_9(self):
429357

430358
self.assertEqual(bbalance, delta)
431359

432-
node.pg_ctl("stop", {
433-
"-D": node.data_dir,
434-
"-w": None,
435-
"-m": "immediate"
436-
})
360+
node.stop({"-m": "immediate"})
437361

438362
with open(path.join(node.logs_dir, "restore_1.log"), "wb") as restore_log:
439363
restore_log.write(self.restore_pb(node, options=["-j", "4", "--verbose"]))
440364

441-
node.pg_ctl("start", {
442-
"-D": node.data_dir,
443-
"-w": None,
444-
"-t": "600"
445-
})
365+
node.start({"-t": "600"})
446366

447367
bbalance = node.execute("postgres", "SELECT sum(bbalance) FROM pgbench_branches")
448368
delta = node.execute("postgres", "SELECT sum(delta) FROM pgbench_history")
@@ -488,20 +408,12 @@ def test_restore_full_under_load_ptrack_10(self):
488408

489409
self.assertEqual(bbalance, delta)
490410

491-
node.pg_ctl("stop", {
492-
"-D": node.data_dir,
493-
"-w": None,
494-
"-m": "immediate"
495-
})
411+
node.stop({"-m": "immediate"})
496412

497413
with open(path.join(node.logs_dir, "restore_1.log"), "wb") as restore_log:
498414
restore_log.write(self.restore_pb(node, options=["-j", "4", "--verbose"]))
499415

500-
node.pg_ctl("start", {
501-
"-D": node.data_dir,
502-
"-w": None,
503-
"-t": "600"
504-
})
416+
node.start({"-t": "600"})
505417

506418
bbalance = node.execute("postgres", "SELECT sum(bbalance) FROM pgbench_branches")
507419
delta = node.execute("postgres", "SELECT sum(delta) FROM pgbench_history")
@@ -542,11 +454,7 @@ def test_restore_to_xid_inclusive_11(self):
542454
# been archived up to the xmin point saved earlier without that.
543455
node.execute("postgres", "SELECT pg_switch_xlog()")
544456

545-
node.pg_ctl("stop", {
546-
"-D": node.data_dir,
547-
"-w": None,
548-
"-m": "fast"
549-
})
457+
node.stop({"-m": "fast"})
550458

551459
with open(path.join(node.logs_dir, "restore_1.log"), "wb") as restore_log:
552460
restore_log.write(self.restore_pb(
@@ -559,11 +467,7 @@ def test_restore_to_xid_inclusive_11(self):
559467
]
560468
))
561469

562-
node.pg_ctl("start", {
563-
"-D": node.data_dir,
564-
"-w": None,
565-
"-t": "600"
566-
})
470+
node.start({"-t": "600"})
567471

568472
after = node.execute("postgres", "SELECT * FROM pgbench_branches")
569473
self.assertEqual(before, after)

‎tests/validate_test.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,7 @@ def test_validate_broke_wal_1(self):
4747
target_xid = res[0][0]
4848

4949
node.execute("postgres", "SELECT pg_switch_xlog()")
50-
51-
node.pg_ctl("stop", {
52-
"-D": node.data_dir,
53-
"-w": None,
54-
"-m": "immediate"
55-
})
50+
node.stop({"-m": "immediate"})
5651

5752
wals_dir = path.join(self.backup_dir(node), "wal")
5853
wals = [f for f in listdir(wals_dir) if path.isfile(path.join(wals_dir, f))]

0 commit comments

Comments
 (0)