flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-07 07:56:12 +00:00
Code Issues Releases Wiki Activity

No longer test for grapi socket, but kapi endpoint instead (#346)

Browse Source 
* we can no longer test for the existance of notify.sock since version 10.1.0 introduces multiple sockets

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* switch startup tests to tcp tests for kapi endpoint

Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
Felix Bartels 2020-02-27 15:00:43 +01:00 committed by GitHub
parent 6521970f23
commit 40981f460b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/start-service.sh
View File

@ -187,7 +187,6 @@ kapi)
if [ "$KCCONF_KAPID_INSECURE" = "yes" ]; then if [ "$KCCONF_KAPID_INSECURE" = "yes" ]; then
dockerize \ dockerize \
-skip-tls-verify \ -skip-tls-verify \
-wait file:///var/run/kopano/grapi/notify.sock \
-wait "$KCCONF_KAPID_OIDC_ISSUER_IDENTIFIER"/.well-known/openid-configuration \ -wait "$KCCONF_KAPID_OIDC_ISSUER_IDENTIFIER"/.well-known/openid-configuration \
-timeout 360s -timeout 360s
else else

2
examples/meet/tests/startup-test/test.sh
View File

@ -5,8 +5,8 @@ set -ex
# waits for key events in various containers # waits for key events in various containers
# e.g. kopano_server:236 signals successful start of kopano-server process # e.g. kopano_server:236 signals successful start of kopano-server process
dockerize \ dockerize \
-wait file:///var/run/kopano/grapi/notify.sock \
-wait http://kopano_konnect:8777/.well-known/openid-configuration \ -wait http://kopano_konnect:8777/.well-known/openid-configuration \
-wait tcp://kopano_kapi:8039 \
-wait tcp://kopano_kwmserver:8778 \ -wait tcp://kopano_kwmserver:8778 \
-wait tcp://kopano_meet:9080 \ -wait tcp://kopano_meet:9080 \
-wait tcp://web:2015 \ -wait tcp://web:2015 \

7
tests/startup-test/test.sh
View File

@ -5,20 +5,19 @@ set -ex
# waits for key events in various containers # waits for key events in various containers
# e.g. kopano_server:236 signals successful start of kopano-server process # e.g. kopano_server:236 signals successful start of kopano-server process
dockerize \ 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_konnect:8777/.well-known/openid-configuration \
-wait http://kopano_meet:9080/meet \
-wait tcp://"${KCCONF_SERVER_MYSQL_HOST}":3306 \ -wait tcp://"${KCCONF_SERVER_MYSQL_HOST}":3306 \
-wait tcp://kopano_dagent:2003 \ -wait tcp://kopano_dagent:2003 \
-wait tcp://kopano_gateway:143 \ -wait tcp://kopano_gateway:143 \
-wait tcp://kopano_ical:8080 \ -wait tcp://kopano_ical:8080 \
-wait tcp://kopano_kapi:8039 \
-wait tcp://kopano_kwmserver:8778 \ -wait tcp://kopano_kwmserver:8778 \
-wait http://kopano_meet:9080/meet \
-wait tcp://kopano_server:236 \ -wait tcp://kopano_server:236 \
-wait tcp://kopano_server:237 \ -wait tcp://kopano_server:237 \
-wait tcp://web:2015 \
-wait tcp://kopano_webapp:9080 \ -wait tcp://kopano_webapp:9080 \
-wait tcp://kopano_zpush:80 \ -wait tcp://kopano_zpush:80 \
-wait tcp://web:2015 \
-timeout 120s -timeout 120s
# until goss is part of the general testsuite check goss for kopano-server here as well # until goss is part of the general testsuite check goss for kopano-server here as well