regression tests on travis #3

kelvich · kelvich · commit 262e4bc4cc93 · 2016-10-21T16:07:06.000+03:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,11 @@
 FROM alpine:3.4
 
-RUN apk add --update gcc libc-dev bison flex readline-dev zlib-dev perl make
+RUN apk add --update gcc libc-dev bison flex readline-dev zlib-dev perl make diffutils
 
 # there is already accidental postgres user in alpine
 # RUN addgroup pg && adduser -h /pg -D -G pg pg
 RUN mkdir /pg && chown postgres:postgres pg
 
-USER postgres
-
 ENV LANG en_US.utf8
 ENV CFLAGS -O0
 ENV PATH /pg/install/bin:$PATH
diff --git a/contrib/mmts/tests2/docker-regress.sh b/contrib/mmts/tests2/docker-regress.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+cd /pg/src/src/test/regress
+
+./pg_regress --use-existing \
+    --schedule=parallel_schedule \
+    --host=node1 \
+    --user=postgres \
+    --dlpath=/pg/src/src/test/regress/
+
+cat regression.diffs
diff --git a/contrib/mmts/tests2/test_regression.py b/contrib/mmts/tests2/test_regression.py
@@ -3,9 +3,11 @@
 import time
 
 class RecoveryTest(unittest.TestCase):
+
     @classmethod
     def setUpClass(self):
         subprocess.check_call(['docker-compose','up',
+            '--build',
             '--force-recreate',
             '-d'])
 
@@ -14,16 +16,12 @@ def tearDownClass(self):
         subprocess.check_call(['docker-compose','down'])
 
     def test_regression(self):
+        # XXX: make smth clever here
         time.sleep(30)
-        subprocess.check_call(['../../../src/test/regress/pg_regress',
-            '--use-existing',
-            '--schedule=../../../src/test/regress/parallel_schedule',
-            '--host=127.0.0.1',
-            '--port=15432',
-            '--user=postgres',
-            '--inputdir=../../../src/test/regress/',
-            '--outputdir=../../../src/test/regress/',
-            '--dlpath=/pg/src/src/test/regress/'
+        subprocess.check_call(['docker', 'run',
+            '--network=tests2_default',
+            'tests2_node1',
+            '/pg/mmts/tests2/docker-regress.sh',
         ])
 
 if __name__ == '__main__':
