From 40981f460ba06243a10e5b9fbebf5ba28814161e Mon Sep 17 00:00:00 2001 From: Felix Bartels <1257835+fbartels@users.noreply.github.com> Date: Thu, 27 Feb 2020 15:00:43 +0100 Subject: [PATCH] No longer test for grapi socket, but kapi endpoint instead (#346) * we can no longer test for the existance of notify.sock since version 10.1.0 introduces multiple sockets Signed-off-by: Felix Bartels * switch startup tests to tcp tests for kapi endpoint Signed-off-by: Felix Bartels --- core/start-service.sh | 1 - examples/meet/tests/startup-test/test.sh | 2 +- tests/startup-test/test.sh | 7 +++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/start-service.sh b/core/start-service.sh index 5fae58e..76dc637 100755 --- a/core/start-service.sh +++ b/core/start-service.sh @@ -187,7 +187,6 @@ kapi) if [ "$KCCONF_KAPID_INSECURE" = "yes" ]; then dockerize \ -skip-tls-verify \ - -wait file:///var/run/kopano/grapi/notify.sock \ -wait "$KCCONF_KAPID_OIDC_ISSUER_IDENTIFIER"/.well-known/openid-configuration \ -timeout 360s else diff --git a/examples/meet/tests/startup-test/test.sh b/examples/meet/tests/startup-test/test.sh index f5c74ae..0dbdfb0 100755 --- a/examples/meet/tests/startup-test/test.sh +++ b/examples/meet/tests/startup-test/test.sh @@ -5,8 +5,8 @@ set -ex # waits for key events in various containers # e.g. kopano_server:236 signals successful start of kopano-server process dockerize \ - -wait file:///var/run/kopano/grapi/notify.sock \ -wait http://kopano_konnect:8777/.well-known/openid-configuration \ + -wait tcp://kopano_kapi:8039 \ -wait tcp://kopano_kwmserver:8778 \ -wait tcp://kopano_meet:9080 \ -wait tcp://web:2015 \ diff --git a/tests/startup-test/test.sh b/tests/startup-test/test.sh index e82be8e..f86c801 100755 --- a/tests/startup-test/test.sh +++ b/tests/startup-test/test.sh @@ -5,20 +5,19 @@ set -ex # waits for key events in various containers # e.g. kopano_server:236 signals successful start of kopano-server process dockerize \ - -wait file://var/run/kopano/grapi/notify.sock \ - -wait file://var/run/kopano/server.sock \ -wait http://kopano_konnect:8777/.well-known/openid-configuration \ + -wait http://kopano_meet:9080/meet \ -wait tcp://"${KCCONF_SERVER_MYSQL_HOST}":3306 \ -wait tcp://kopano_dagent:2003 \ -wait tcp://kopano_gateway:143 \ -wait tcp://kopano_ical:8080 \ + -wait tcp://kopano_kapi:8039 \ -wait tcp://kopano_kwmserver:8778 \ - -wait http://kopano_meet:9080/meet \ -wait tcp://kopano_server:236 \ -wait tcp://kopano_server:237 \ - -wait tcp://web:2015 \ -wait tcp://kopano_webapp:9080 \ -wait tcp://kopano_zpush:80 \ + -wait tcp://web:2015 \ -timeout 120s # until goss is part of the general testsuite check goss for kopano-server here as well