From f9719f8a2bad1143c9a8480bb9e9910441c18fd5 Mon Sep 17 00:00:00 2001 From: mlan Date: Mon, 16 Nov 2020 12:25:36 +0100 Subject: [PATCH] - [travis-ci](.travis.yml) Fixed test errors on Travis-CI, which was due to long SQL db initialization. --- test/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/Makefile b/test/Makefile index e8f7e95..f6cd0e0 100644 --- a/test/Makefile +++ b/test/Makefile @@ -55,7 +55,6 @@ APP_ALOG ?= 6 APP_ENV ?= $(NET_ENV) $(SQL_ENV) \ --name $(APP_NAME) \ --hostname $(APP_FQDN) \ --p "127.0.0.1:2003:2003" \ -e MYSQL_HOST=$(DB_NAME) \ -e USER_PLUGIN=ldap \ -e LDAP_URI=ldap://$(AUT_NAME):389/ \ @@ -77,6 +76,8 @@ APPF_ENV ?= $(APPS_ENV) \ APPA_ENV ?= $(APPS_ENV) \ -v $(shell pwd)/$(TST_ACMD):/$(TST_ACMD) +#-p "127.0.0.1:2003:2003" + AUT_NAME ?= auth AUT_IMG ?= mlan/openldap AUT_FQDN ?= $(AUT_NAME).$(MAIL_DOM) @@ -155,6 +156,7 @@ test-up_1: test-up-net test-up-auth_1 # # docker run -d $(DB_ENV) $(DB_VOL) $(DB_IMG) + sleep $(TST_W8L1) docker run -d $(APP_ENV) $(APP_VOL) $(IMG_REPO):$(call _ver,$(IMG_VER),core) test-up_2: test-up-net test-up-auth_2 $(TST_CERT) @@ -168,6 +170,7 @@ test-up_2: test-up-net test-up-auth_2 $(TST_CERT) # # docker run -d $(DB_ENV) $(DB_VOL) $(DB_IMG) + sleep $(TST_W8L1) docker run -d $(APPF_ENV) $(APP_VOL) $(IMG_REPO):$(call _ver,$(IMG_VER),core) test-up_3: test-up-net test-up-auth_3 $(TST_ACME) @@ -182,6 +185,7 @@ test-up_3: test-up-net test-up-auth_3 $(TST_ACME) # # docker run -d $(DB_ENV) $(DB_VOL) $(DB_IMG) + sleep $(TST_W8L1) docker run -d $(APPA_ENV) $(APP_VOL) $(IMG_REPO):$(call _ver,$(IMG_VER),full) test-up: test-up_1 @@ -228,8 +232,8 @@ test-up-auth_%: test-lmtp: test-lmtp_0 test-lmtp_%: printf "LHLO mx\nMAIL FROM: \nRCPT TO: <$(MAIL_US1)@$(MAIL_DOM)>\nDATA\nFrom: A tester \nTo: <$(MAIL_US1)@$(MAIL_DOM)>\nDate: $$(date)\nSubject: $(MAIL_SUB)$*\n$(MAIL_MSG)$*\n.\nQUIT\n"\ - | nc -C localhost 2003 # > /dev/null -# | nc -C $(call _ip,$(APP_NAME)) 2003 # > /dev/null + | nc -C $(call _ip,$(APP_NAME)) 2003 # > /dev/null +# | nc -C localhost 2003 # > /dev/null case $* in [1-3]) sleep $(TST_W8S1);; [4-9]) sleep $(TST_W8S2);; esac test-cfg_%: