From 338520fb75416075676dcebca5714da42be2a2e2 Mon Sep 17 00:00:00 2001 From: Tuna Date: Tue, 6 Sep 2016 22:48:11 +0700 Subject: [PATCH] rebase master, update tests --- script/test/cmd/tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/test/cmd/tests.sh b/script/test/cmd/tests.sh index c108348a..e8fdb273 100755 --- a/script/test/cmd/tests.sh +++ b/script/test/cmd/tests.sh @@ -38,9 +38,9 @@ convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtur ###### # Tests related to docker-compose file in /script/test/fixtures/entrypoint-command # kubernetes test -convert::expect_success_and_warning "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/output-k8s.json" "Service cannot be created because of missing port." +convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/docker-compose.yml convert --stdout" "$KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/output-k8s.json" "Service cannot be created because of missing port." # openshift test -convert::expect_success_and_warning "kompose convert --stdout --dc -f $KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/output-os.json" "Service cannot be created because of missing port." +convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/docker-compose.yml convert --stdout --dc" "$KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/output-os.json" "Service cannot be created because of missing port." exit $EXIT_STATUS