From d6167636fab15dfdead2b70dc7ee167dd2c13ddd Mon Sep 17 00:00:00 2001
From: Klaus Weidenbach <Klaus.Weidenbach@gmx.net>
Date: Tue, 15 Jan 2019 01:01:49 +0100
Subject: Add PostgreSQL to gitlab-ci setup.

Run our tests against a PostgreSQL again.
---
 tests/phpunit-pgsql.xml | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'tests')

diff --git a/tests/phpunit-pgsql.xml b/tests/phpunit-pgsql.xml
index 078056d56..8b11aae31 100644
--- a/tests/phpunit-pgsql.xml
+++ b/tests/phpunit-pgsql.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
          bootstrap="../boot.php"
          forceCoversAnnotation="false"
          beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutTodoAnnotatedTests="true"
          verbose="true">
-    <testsuite name="Hubzilla default Test Suite">
-        <directory suffix="Test.php">./unit/</directory>
-    </testsuite>
-    <testsuite name="API Test Suite">
-        <directory suffix="Test.php" prefix="API">./unit/</directory>
-    </testsuite>
+    <testsuites>
+        <testsuite name="Hubzilla default Test Suite">
+            <directory suffix="Test.php">./unit/</directory>
+        </testsuite>
+        <testsuite name="API Test Suite">
+            <directory suffix="Test.php" prefix="API">./unit/</directory>
+        </testsuite>
+    </testsuites>
     <groups>
         <exclude>
             <group>mysql</group>
         </exclude>
     </groups>
-    <!--cover reporting-->
+    <!--coverage reporting-->
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">../Zotlabs/</directory>
@@ -26,21 +28,22 @@
         </whitelist>
     </filter>
     <logging>
-        <log type="junit" target="./results/junit.xml" logIncompleteSkipped="false"/>
-        <log type="coverage-clover" target="./results/coverage-clover.xml"/>
+        <log type="junit" target="./results/junit.xml"/>
+        <!--<log type="coverage-clover" target="./results/coverage-clover.xml"/>-->
         <log type="coverage-html" target="./results/coverage-report/" lowUpperBound="35"
         highLowerBound="70"/>
-        <log type="testdox-text" target="./results/testdox.txt"/>
+        <!--<log type="testdox-text" target="./results/testdox.txt"/>-->
+        <log type="testdox-html" target="./results/testdox.html"/>
     </logging>
     <php>
         <!-- Default test database config, only used if no environment variables
              with same names are set.
              !!! Never run against a real database, it will truncate all tables -->
-        <env name="hz_db_server" value="127.0.0.1"/>
+        <env name="hz_db_server" value="postgres"/>
         <env name="hz_db_scheme" value="pgsql"/>
         <env name="hz_db_port" value="5432"/>
-        <env name="hz_db_user" value="travis_hz"/>
-        <env name="hz_db_pass" value="hubzilla"/>
-        <env name="hz_db_database" value="travis_hubzilla"/>
+        <env name="hz_db_user" value="ci-user"/>
+        <env name="hz_db_pass" value="ci-pass"/>
+        <env name="hz_db_database" value="ci-db"/>
     </php>
 </phpunit>
-- 
cgit v1.2.3