[libgda: 2/7] CI: MetaStore test for PostgreSQL will be run



commit 3965ab0e64419f7c70d8b8b11197d4164b6deb0e
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Wed Dec 12 19:32:33 2018 -0600

    CI: MetaStore test for PostgreSQL will be run
    
    PostgreSQL test will return non-zero status if test can't be performed.

 .gitlab-ci.yml                                 | 12 +++++++++---
 tests/meta-store/check_meta_store_postgresql.c |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1e28ec3e..0ecc4c07f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,8 +40,14 @@ variables:
                 postgresql-client-common
 
   GIT_SUBMODULE_STRATEGY: normal
-  POSTGRESQL_DBCREATE_PARAMS: "HOST=postgres;PORT=5432;ADM_LOGIN=test;ADM_PASSWORD=test1"
-  POSTGRESQL_CNC_PARAMS: "HOST=postgres;USERNAME=test;PASSWORD=test1"
+  GDA_PSQ_HOST: postgres
+  GDA_PSQ_PASSWORD: "postgres"
+  GDA_PSQ_USER: postgres 
+  SQLITE_DBCREATE_PARAMS: "DB_DIR=."
+  SQLITE_CNC_PARAMS: "DB_DIR=."
+  POSTGRESQL_DBCREATE_PARAMS: 
"HOST=$GDA_PSQ_HOST;PORT=5432;ADM_LOGIN=$GDA_PSQ_USER;ADM_PASSWORD='$GDA_PSQ_PASSWORD'"
+  POSTGRESQL_CNC_PARAMS: "HOST=$GDA_PSQ_HOST;PORT=5432;USERNAME=$GDA_PSQ_USER;PASSWORD='$GDA_PSQ_PASSWORD'"
+  POSTGRESQL_META_CNC: "DB_NAME=postgres;HOST=postgres;USERNAME=postgres"
   
 before_script:
   - apt update && apt -y install $DEPENDENCIES
@@ -114,4 +120,4 @@ pages:
   - mv doc/C/libgdaui/html public/C/libgdaui-6.0
   artifacts:
     paths:
-    - public
\ No newline at end of file
+    - public
diff --git a/tests/meta-store/check_meta_store_postgresql.c b/tests/meta-store/check_meta_store_postgresql.c
index 7923bfc11..7a153f66e 100644
--- a/tests/meta-store/check_meta_store_postgresql.c
+++ b/tests/meta-store/check_meta_store_postgresql.c
@@ -37,7 +37,7 @@ main(int argc, char ** argv)
     {
       g_print ("PostgreSQL test not run, please set the POSTGRESQL_META_CNC environment variable \n"
                "For example 'DB_NAME=meta'\n");
-      return EXIT_SUCCESS;
+      return EXIT_FAILURE;
     }
        /* connection try */
        cnc = gda_connection_open_from_string ("PostgreSQL", cnc_string, NULL, GDA_CONNECTION_OPTIONS_NONE, 
&error);
@@ -48,7 +48,7 @@ main(int argc, char ** argv)
                }
                g_print ("Postgres test not run, please setup a database 'test', owned by 'test' role with 
password 'test1' at localhost\n");
                g_print ("Test Skip.\n");
-               return EXIT_SUCCESS;
+               return EXIT_FAILURE;
        }
        g_object_unref (cnc);
        /* Clean everything which might exist in the store */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]