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

Commitad2bd06

Browse files
committed
regression tests on travis#5
1 parent8b278ff commitad2bd06

File tree

4 files changed

+51
-47
lines changed

4 files changed

+51
-47
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ RUN export RAFTABLE_PATH=/pg/src/contrib/raftable && \
1010
cd /pg/mmts && make clean && make install
1111

1212
# pg_regress client assumes such dir exists on server
13-
RUN mkdir /pg/src/src/test/regress/results
1413

1514
USER postgres
15+
RUN mkdir /pg/src/src/test/regress/results
1616
ENV PGDATA /pg/data
1717
ENTRYPOINT ["/pg/mmts/tests2/docker-entrypoint.sh"]
1818

‎tests2/lib/bank_client.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ def run(self):
180180
self.loop=asyncio.get_event_loop()
181181

182182
fori,_inenumerate(self.dsns):
183-
asyncio.async(self.exec_tx(self.transfer_tx,'transfer',i))
184-
asyncio.async(self.exec_tx(self.total_tx,'sumtotal',i))
183+
asyncio.ensure_future(self.exec_tx(self.transfer_tx,'transfer',i))
184+
asyncio.ensure_future(self.exec_tx(self.total_tx,'sumtotal',i))
185185

186-
asyncio.async(self.status())
186+
asyncio.ensure_future(self.status())
187187

188188
self.loop.run_forever()
189189

‎tests2/test_recovery.py

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
importunittest
22
importtime
33
importsubprocess
4-
#from lib.bank_client import*
5-
fromclient2importMtmClient
4+
fromlib.bank_clientimportMtmClient
5+
#from client2 import MtmClient
66
importdatetime
77

88
classRecoveryTest(unittest.TestCase):
99
@classmethod
1010
defsetUpClass(self):
11+
subprocess.check_call(['docker-compose','up',
12+
'--force-recreate',
13+
'-d'])
14+
time.sleep(30)
1115
self.client=MtmClient([
12-
"dbname=postgres user=postgres host=127.0.0.1 port=5435",
13-
"dbname=postgres user=postgres host=127.0.0.1 port=5433",
14-
"dbname=postgres user=postgres host=127.0.0.1 port=5434"
16+
"dbname=regression user=postgres host=127.0.0.1 port=15432",
17+
"dbname=regression user=postgres host=127.0.0.1 port=15433",
18+
"dbname=regression user=postgres host=127.0.0.1 port=15434"
1519
],n_accounts=1000)
1620
self.client.bgrun()
1721
time.sleep(5)
@@ -21,52 +25,53 @@ def tearDownClass(self):
2125
print('tearDown')
2226
self.client.stop()
2327

24-
# def test_normal_operations(self):
25-
# print('### normalOpsTest ###')
26-
27-
# for i in range(3):
28-
# time.sleep(3)
29-
# aggs = self.clients.aggregate()
30-
# for agg in aggs:
31-
# # there were some commits
32-
# self.assertTrue( agg['transfer'] > 0 )
33-
34-
deftest_node_partition(self):
35-
print('### nodePartitionTest ###')
36-
37-
subprocess.check_call(['blockade','partition','node3'])
38-
print('### blockade node3 ###')
39-
40-
# clear tx history
41-
self.client.get_status()
28+
deftest_normal_operations(self):
29+
print('### normalOpsTest ###')
4230

4331
foriinrange(3):
44-
print(i,datetime.datetime.now())
4532
time.sleep(3)
4633
aggs=self.client.get_status()
4734
MtmClient.print_aggregates(aggs)
48-
# self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
49-
# self.assertTrue( aggs['transfer_1']['finish']['commit'] > 0 )
50-
# self.assertTrue( aggs['transfer_2']['finish']['commit'] == 0 )
51-
self.assertTrue(aggs['sumtotal_0']['isolation']+aggs['sumtotal_1']['isolation']+aggs['sumtotal_2']['isolation']==0 )
35+
# for agg in aggs:
36+
# # there were some commits
37+
# self.assertTrue( agg['transfer'] > 0 )
5238

53-
subprocess.check_call(['blockade','join'])
54-
print('###deblockade node3 ###')
39+
# def test_node_partition(self):
40+
#print('###nodePartitionTest ###')
5541

56-
# clear tx history
57-
self.client.get_status()
42+
# subprocess.check_call(['blockade','partition','node3'])
43+
# print('### blockade node3 ###')
5844

59-
foriinrange(20):
60-
print(i,datetime.datetime.now())
61-
time.sleep(3)
62-
aggs=self.client.get_status()
63-
MtmClient.print_aggregates(aggs)
64-
self.assertTrue(aggs['sumtotal_0']['isolation']+aggs['sumtotal_1']['isolation']+aggs['sumtotal_2']['isolation']==0 )
45+
# # clear tx history
46+
# self.client.get_status()
47+
48+
# for i in range(3):
49+
# print(i, datetime.datetime.now())
50+
# time.sleep(3)
51+
# aggs = self.client.get_status()
52+
# MtmClient.print_aggregates(aggs)
53+
# # self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
54+
# # self.assertTrue( aggs['transfer_1']['finish']['commit'] > 0 )
55+
# # self.assertTrue( aggs['transfer_2']['finish']['commit'] == 0 )
56+
# self.assertTrue( aggs['sumtotal_0']['isolation'] + aggs['sumtotal_1']['isolation'] + aggs['sumtotal_2']['isolation'] == 0 )
57+
58+
# subprocess.check_call(['blockade','join'])
59+
# print('### deblockade node3 ###')
6560

66-
# check that during last aggregation all nodes were working
67-
self.assertTrue(aggs['transfer_0']['finish']['commit']>0 )
68-
self.assertTrue(aggs['transfer_1']['finish']['commit']>0 )
69-
self.assertTrue(aggs['transfer_2']['finish']['commit']>0 )
61+
# # clear tx history
62+
# self.client.get_status()
63+
64+
# for i in range(20):
65+
# print(i, datetime.datetime.now())
66+
# time.sleep(3)
67+
# aggs = self.client.get_status()
68+
# MtmClient.print_aggregates(aggs)
69+
# self.assertTrue( aggs['sumtotal_0']['isolation'] + aggs['sumtotal_1']['isolation'] + aggs['sumtotal_2']['isolation'] == 0 )
70+
71+
# # check that during last aggregation all nodes were working
72+
# self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
73+
# self.assertTrue( aggs['transfer_1']['finish']['commit'] > 0 )
74+
# self.assertTrue( aggs['transfer_2']['finish']['commit'] > 0 )
7075

7176

7277

‎tests2/test_regression.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ class RecoveryTest(unittest.TestCase):
77
@classmethod
88
defsetUpClass(self):
99
subprocess.check_call(['docker-compose','up',
10-
'--build',
1110
'--force-recreate',
1211
'-d'])
1312

0 commit comments

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