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

Commitf9a8119

Browse files
committed
Catch exit status in regression test.
1 parent2c0a6d6 commitf9a8119

File tree

3 files changed

+47
-45
lines changed

3 files changed

+47
-45
lines changed

‎tests2/docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
POSTGRES_DB:'regression'
1212
NODE_ID:1
1313
CONNSTRS:>-
14-
dbname=regression user=pg host=node1 arbiterport=5433,
14+
dbname=regression user=pg host=node1,
1515
dbname=regression user=pg host=toxi port=12000 arbiterport=12001,
1616
dbname=regression user=pg host=toxi port=13000 arbiterport=13001
1717
ports:
@@ -27,7 +27,7 @@ services:
2727
NODE_ID:2
2828
CONNSTRS:>-
2929
dbname=regression user=pg host=toxi port=21000 arbiterport=21001,
30-
dbname=regression user=pg host=node2 arbiterport=5433,
30+
dbname=regression user=pg host=node2,
3131
dbname=regression user=pg host=toxi port=23000 arbiterport=23001
3232
ports:
3333
-"15433:5432"
@@ -43,7 +43,7 @@ services:
4343
CONNSTRS:>-
4444
dbname=regression user=pg host=toxi port=31000 arbiterport=31001,
4545
dbname=regression user=pg host=toxi port=32000 arbiterport=32001,
46-
dbname=regression user=pg host=node3 arbiterport=5433
46+
dbname=regression user=pg host=node3
4747
ports:
4848
-"15434:5432"
4949

‎tests2/docker-regress.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
cd /pg/src/src/test/regress
44

5-
cat /etc/hosts
6-
75
./pg_regress --use-existing \
86
--schedule=parallel_schedule \
97
--host=node1 \
108
--user=postgres \
119
--dlpath=/pg/src/src/test/regress/
1210

11+
STATUS =$?
12+
1313
cat regression.diffs
14+
15+
exit$STATUS

‎tests2/test_recovery.py

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -31,46 +31,46 @@ def test_normal_operations(self):
3131
time.sleep(3)
3232
aggs=self.client.get_status()
3333
MtmClient.print_aggregates(aggs)
34-
# for agg inaggs:
35-
# # there were some commits
36-
#self.assertTrue( agg['transfer'] > 0 )
37-
38-
#def test_node_partition(self):
39-
# print('### nodePartitionTest ###')
40-
41-
# subprocess.check_call(['blockade','partition','node3'])
42-
# print('### blockade node3 ###')
43-
44-
# # clear tx history
45-
# self.client.get_status()
46-
47-
# for i in range(3):
48-
# print(i, datetime.datetime.now())
49-
# time.sleep(3)
50-
# aggs = self.client.get_status()
51-
# MtmClient.print_aggregates(aggs)
52-
# # self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
53-
# # self.assertTrue( aggs['transfer_1']['finish']['commit'] > 0 )
54-
# # self.assertTrue( aggs['transfer_2']['finish']['commit'] == 0 )
55-
# self.assertTrue( aggs['sumtotal_0']['isolation'] + aggs['sumtotal_1']['isolation'] + aggs['sumtotal_2']['isolation'] == 0 )
56-
57-
# subprocess.check_call(['blockade','join'])
58-
# print('### deblockade node3 ###')
59-
60-
# # clear tx history
61-
# self.client.get_status()
62-
63-
# for i in range(20):
64-
# print(i, datetime.datetime.now())
65-
# time.sleep(3)
66-
# aggs = self.client.get_status()
67-
# MtmClient.print_aggregates(aggs)
68-
# self.assertTrue( aggs['sumtotal_0']['isolation'] + aggs['sumtotal_1']['isolation'] + aggs['sumtotal_2']['isolation'] == 0 )
69-
70-
# # check that during last aggregation all nodes were working
71-
# self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
72-
# self.assertTrue( aggs['transfer_1']['finish']['commit'] > 0 )
73-
# self.assertTrue( aggs['transfer_2']['finish']['commit'] > 0 )
34+
print(aggs)
35+
foragginaggs:
36+
self.assertTrue(aggs[agg]['finish']['commit']>0 )
37+
38+
deftest_node_partition(self):
39+
print('### nodePartitionTest ###')
40+
41+
subprocess.check_call(['blockade','partition','node3'])
42+
print('### blockade node3 ###')
43+
44+
# clear tx history
45+
self.client.get_status()
46+
47+
foriinrange(3):
48+
print(i,datetime.datetime.now())
49+
time.sleep(3)
50+
aggs=self.client.get_status()
51+
MtmClient.print_aggregates(aggs)
52+
# self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
53+
# self.assertTrue( aggs['transfer_1']['finish']['commit'] > 0 )
54+
# self.assertTrue( aggs['transfer_2']['finish']['commit'] == 0 )
55+
self.assertTrue(aggs['sumtotal_0']['isolation']+aggs['sumtotal_1']['isolation']+aggs['sumtotal_2']['isolation']==0 )
56+
57+
subprocess.check_call(['blockade','join'])
58+
print('### deblockade node3 ###')
59+
60+
# clear tx history
61+
self.client.get_status()
62+
63+
foriinrange(20):
64+
print(i,datetime.datetime.now())
65+
time.sleep(3)
66+
aggs=self.client.get_status()
67+
MtmClient.print_aggregates(aggs)
68+
self.assertTrue(aggs['sumtotal_0']['isolation']+aggs['sumtotal_1']['isolation']+aggs['sumtotal_2']['isolation']==0 )
69+
70+
# check that during last aggregation all nodes were working
71+
self.assertTrue(aggs['transfer_0']['finish']['commit']>0 )
72+
self.assertTrue(aggs['transfer_1']['finish']['commit']>0 )
73+
self.assertTrue(aggs['transfer_2']['finish']['commit']>0 )
7474

7575

7676

0 commit comments

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