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

Commit 6fe3867

Browse files
committed
Fix regreession test runner
1 parent c8c6143 commit 6fe3867

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ 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-
13+
RUN cp /pg/src/src/test/regress/*.so /pg/install/lib/postgresql/
1414
USER postgres
1515
RUN mkdir /pg/src/src/test/regress/results
1616
ENV PGDATA /pg/data

tests2/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ if [ "$1" = 'postgres' ]; then
7171
multimaster.conn_strings = '$CONNSTRS'
7272
multimaster.heartbeat_recv_timeout = 1100
7373
multimaster.heartbeat_send_timeout = 250
74-
multimaster.twopc_min_timeout = 20000
75-
multimaster.min_2pc_timeout = 10000
74+
multimaster.twopc_min_timeout = 50000
75+
multimaster.min_2pc_timeout = 50000
7676
EOF
7777

7878
cat $PGDATA/postgresql.conf

tests2/support/docker-regress.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ cd /pg/src/src/test/regress
55
./pg_regress --use-existing \
66
--schedule=parallel_schedule \
77
--host=node1 \
8-
--user=postgres \
9-
--dlpath=/pg/src/src/test/regress/
8+
--user=postgres
109

1110
STATUS=$?
1211

13-
cat regression.diffs
12+
# cat regression.diffs
1413

1514
exit $STATUS

tests2/test_regression.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ def tearDownClass(self):
1818
def test_regression(self):
1919
# XXX: make smth clever here
2020
time.sleep(31)
21-
subprocess.check_call(['docker', 'run',
22-
'--network=tests2_default',
23-
'tests2_node1',
21+
subprocess.check_call(['docker', 'exec',
22+
'node1',
2423
'/pg/mmts/tests2/support/docker-regress.sh',
2524
])
2625

0 commit comments

Comments
 (0)