From ee44a2630f1d8631dc8b35ca0a67c2483dd8f984 Mon Sep 17 00:00:00 2001 From: Charlie Drage Date: Tue, 4 Apr 2017 09:09:12 -0400 Subject: [PATCH] Move docker-compose.yml test file to tests Moves a file that was incorrectly being used from examples to script/test/fixtures. --- script/test/cmd/tests.sh | 8 ++++---- script/test/fixtures/redis-example/docker-compose.yml | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 script/test/fixtures/redis-example/docker-compose.yml diff --git a/script/test/cmd/tests.sh b/script/test/cmd/tests.sh index 4cb4b69c..8337ec32 100755 --- a/script/test/cmd/tests.sh +++ b/script/test/cmd/tests.sh @@ -179,13 +179,13 @@ convert::expect_success "kompose --provider openshift -f $KOMPOSE_ROOT/script/te ###### # Test the output file behavior of kompose convert # Default behavior without -o -convert::check_artifacts_generated "kompose -f $KOMPOSE_ROOT/examples/docker-compose.yml convert -j" "redis-deployment.json" "redis-service.json" "web-deployment.json" "web-service.json" +convert::check_artifacts_generated "kompose -f $KOMPOSE_ROOT/script/test/fixtures/redis-example/docker-compose.yml convert -j" "redis-deployment.json" "redis-service.json" "web-deployment.json" "web-service.json" # Behavior with -o -convert::check_artifacts_generated "kompose -f $KOMPOSE_ROOT/examples/docker-compose.yml convert -o output_file -j" "output_file" +convert::check_artifacts_generated "kompose -f $KOMPOSE_ROOT/script/test/fixtures/redis-example/docker-compose.yml convert -o output_file -j" "output_file" # Behavior with -o -convert::check_artifacts_generated "kompose -f $KOMPOSE_ROOT/examples/docker-compose.yml convert -o $TEMP_DIR -j" "$TEMP_DIR/redis-deployment.json" "$TEMP_DIR/redis-service.json" "$TEMP_DIR/web-deployment.json" "$TEMP_DIR/web-service.json" +convert::check_artifacts_generated "kompose -f $KOMPOSE_ROOT/script/test/fixtures/redis-example/docker-compose.yml convert -o $TEMP_DIR -j" "$TEMP_DIR/redis-deployment.json" "$TEMP_DIR/redis-service.json" "$TEMP_DIR/web-deployment.json" "$TEMP_DIR/web-service.json" # Behavior with -o / -convert::check_artifacts_generated "kompose -f $KOMPOSE_ROOT/examples/docker-compose.yml convert -o $TEMP_DIR/output_file -j" "$TEMP_DIR/output_file" +convert::check_artifacts_generated "kompose -f $KOMPOSE_ROOT/script/test/fixtures/redis-example/docker-compose.yml convert -o $TEMP_DIR/output_file -j" "$TEMP_DIR/output_file" # Test related to support docker-compose.yaml beside docker-compose.yml # Store the original path diff --git a/script/test/fixtures/redis-example/docker-compose.yml b/script/test/fixtures/redis-example/docker-compose.yml new file mode 100644 index 00000000..42c1e9dd --- /dev/null +++ b/script/test/fixtures/redis-example/docker-compose.yml @@ -0,0 +1,10 @@ +web: + image: tuna/docker-counter23 + ports: + - "5000:5000" + links: + - redis +redis: + image: redis:3.0 + ports: + - "6379"