try again

Author: Skycoder42

tests/auto/datasync/WsRemoteConnectorTest/WsRemoteConnectorTest.pro

@@ -20,7 +20,11 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 
 SOURCES += tst_wsremoteconnector.cpp
+
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 DEFINES += BUILDDIR=\\\"$$OUT_PWD/\\\"
 
 HEADERS +=
+
+include(setup.pri)
+DEFINES += SETUP_CONF=\\\"$$SETUP_FILE\\\"

tests/auto/datasync/WsRemoteConnectorTest/server-setup.conf

@@ -0,0 +1,14 @@
+[general]
+name=QtDataSync-TestServer
+
+[server]
+host=localhost
+port=4242
+secret=baum42
+
+[database]
+name=QtDataSync
+host=localhost
+port=15432
+username=qtdatasync
+password=baum42

tests/auto/datasync/WsRemoteConnectorTest/setup.pri

@@ -0,0 +1 @@
+SETUP_FILE=$$PWD/server-setup.conf

tests/auto/datasync/WsRemoteConnectorTest/tst_wsremoteconnector.cpp

@@ -59,9 +59,9 @@ void WsRemoteConnectorTest::initTestCase()
 
 	//now start the server!
 	QProcess p;
-	p.start(QStringLiteral("%1/../../../../bin/qdatasyncserver start -c %2/../../../../tools/qdatasyncserver/docker_setup.conf")
+	p.start(QStringLiteral("%1/../../../../bin/qdatasyncserver start -c %2")
 			.arg(BUILDDIR)
-			.arg(SRCDIR));
+			.arg(SETUP_CONF));
 	QVERIFY2(p.waitForFinished(), qPrintable(p.errorString()));
 	QCOMPARE(p.exitCode(), EXIT_SUCCESS);
 }

tests/ci/docker-compose.yaml

@@ -0,0 +1,12 @@
+version: '2.2'
+services:
+  datasync_postgres:
+    container_name: datasync_example_postgres
+    image: postgres:latest
+    ports:
+      - "15432:5432/tcp"
+    environment:
+      POSTGRES_USER: qtdatasync
+      POSTGRES_PASSWORD: baum42
+      POSTGRES_DB: QtDataSync
+    network_mode: "bridge"

tests/ci/server-setup.conf

@@ -0,0 +1,13 @@
+[general]
+name=QtDataSync-TestServer
+
+[server]
+host=localhost
+port=4242
+secret=baum42
+
+[database]
+name=QtDataSync
+port=15432
+username=qtdatasync
+password=baum42

tests/ci/setup.sh

@@ -6,7 +6,13 @@ if [[ $PLATFORM == "gcc_64" ]]; then
 	sudo curl -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/1.14.0/docker-compose-$(uname -s)-$(uname -m)"
 	sudo chmod +x /usr/local/bin/docker-compose
 
-	sudo docker-compose -f ./tools/qdatasyncserver/docker-compose.yaml up -d
+	sudo docker-compose -f ./tests/ci/docker-compose.yaml up -d
+	#docker run -d --name datasync_example_postgres -e POSTGRES_USER=qtdatasync -e POSTGRES_PASSWORD=baum42 -e POSTGRES_DB=QtDataSync postgres:latest
+
+	
+	postgresIp=$(sudo docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datasync_example_postgres)
+	echo host=$postgresIp >> ./tests/ci/server-setup.conf
+	echo 'SETUP_FILE=$$PWD/../../../ci/server-setup.conf' > ./tests/auto/datasync/WsRemoteConnectorTest/setup.pri
 fi
 
 # disable test on osx as workaround (build fail and no docker support)