merchant

commit f110c48ec37c4913a51cea6ce521ec1289bfab2b
parent 9d290499b50775ec4791ac2809666ea7694b63be
Author: Özgür Kesim <oec-taler@kesim.org>
Date:   Sat, 20 Jan 2024 15:43:13 +0100

[ci] fixing CI testing, WIP

Diffstat:
M
contrib/ci/Containerfile
 | 
1
+
M
contrib/ci/jobs/2-test/config.ini
 | 
2
+-
M
contrib/ci/jobs/2-test/test.sh
 | 
5
++---
M
src/backenddb/plugin_merchantdb_postgres.c
 | 
5
+++++
M
src/testing/test_template.conf
 | 
1
+

5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile
@@ -64,6 +64,7 @@ RUN cat /etc/apt/preferences.d/taler && \
 		   taler-exchange-offline \
 		   taler-auditor \
 		   taler-wallet-cli \
+		   taler-harness \
 && rm -rf /var/lib/apt/lists/*
 
 RUN apt-get update -yqq && \
diff --git a/contrib/ci/jobs/2-test/config.ini b/contrib/ci/jobs/2-test/config.ini
@@ -2,5 +2,5 @@
 HALT_ON_FAILURE = False
 WARN_ON_FAILURE = True
 CONTAINER_BUILD = True
-CONTAINER_NAME = merchant
+CONTAINER_NAME = localhost/merchant
 CONTAINER_ARCH = amd64
diff --git a/contrib/ci/jobs/2-test/test.sh b/contrib/ci/jobs/2-test/test.sh
@@ -8,8 +8,7 @@ apt-get upgrade -yqq
 ./configure CFLAGS="-ggdb -O0" \
 	    --enable-logging=verbose \
 	    --disable-doc
-make
-make install
+make -j install
 
 sudo -u postgres /usr/lib/postgresql/15/bin/postgres -D /etc/postgresql/15/main -h localhost -p 5432 &
 sleep 10
@@ -19,7 +18,7 @@ sudo -u postgres createdb -p 5432 -O root talercheck
 check_command()
 {
 	# Set LD_LIBRARY_PATH so tests can find the installed libs
-	LD_LIBRARY_PATH=/usr/local/lib PGPORT=5432 make check
+	LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib/taler PGPORT=5432 make check
 }
 
 print_logs()
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
@@ -211,6 +211,11 @@ postgres_create_tables (void *cls)
                                      NULL);
   if (NULL == conn)
     return GNUNET_SYSERR;
+  if (0 >
+      GNUNET_PQ_eval_prepared_non_select (conn,
+                                          "create_tables",
+                                          NULL))
+    ret = GNUNET_SYSERR;
   ret = GNUNET_PQ_exec_sql (conn,
                             "procedures");
   GNUNET_PQ_disconnect (conn);
diff --git a/src/testing/test_template.conf b/src/testing/test_template.conf
@@ -46,6 +46,7 @@ FORCE_AUDIT = YES
 
 [merchantdb-postgres]
 CONFIG = postgres:///talercheck
+SQL_DIR = $DATADIR/sql/merchant/
 
 [bank]
 HTTP_PORT = 8082