From f3f144c844222b3fd28c4eae472164092eb7dc90 Mon Sep 17 00:00:00 2001 From: Marcel Wagner Date: Sat, 6 Apr 2019 09:05:12 +0000 Subject: [PATCH] tests/Makefile: Removed -i switch from docker Signed-off-by: Marcel Wagner --- tests/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 0669b0e2..dde10d65 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -55,14 +55,12 @@ test: npm-install @until echo new-test | kafkacat -P -b $(KAFKA_BROKER) -t heartbeat; do echo "Kafka not ready. Waiting ..."; sleep 1; done @ (for i in {1..4}; do echo new-test ; done) | kafkacat -P -b $(KAFKA_BROKER) -t heartbeat; @. ../setup-environment.sh && until kafkacat -C -b $(KAFKA_BROKER) -t heartbeat -e -o -4 2> /dev/null | grep -m 1 "dashboard"; do sleep 1 ; done - ifeq ($(TESTING_PLATFORM), docker) @$(call msg,"Resetting database ..."); - @. ../setup-environment.sh && docker exec -i "$${COMPOSE_PROJECT_NAME}_frontend_1" node /app/admin resetDB - + @. ../setup-environment.sh && docker exec "$${COMPOSE_PROJECT_NAME}_frontend_1" node /app/admin resetDB @$(call msg,"Adding a user for testing ..."); - @. ../setup-environment.sh && docker exec -i "$${COMPOSE_PROJECT_NAME}_frontend_1" node /app/admin addUser $(USERNAME) $(PASSWORD) $(ROLE) > /dev/null - @. ../setup-environment.sh && docker exec -i "$${COMPOSE_PROJECT_NAME}_frontend_1" node /app/admin addUser $(USERNAME2) $(PASSWORD2) $(ROLE2) > /dev/null + @. ../setup-environment.sh && docker exec "$${COMPOSE_PROJECT_NAME}_frontend_1" node /app/admin addUser $(USERNAME) $(PASSWORD) $(ROLE) > /dev/null + @. ../setup-environment.sh && docker exec "$${COMPOSE_PROJECT_NAME}_frontend_1" node /app/admin addUser $(USERNAME2) $(PASSWORD2) $(ROLE2) > /dev/null else @$(call msg,"Resetting database ..."); @kubectl exec -i $(DASHBOARD_POD) -c dashboard -- node /app/admin resetDB