Merge pull request #1 from jquick/jq/test_additions

Test additions

Author: jquick

commands/run.sh

@@ -42,15 +42,14 @@ prebuilt_services=()
 # We look for a prebuilt images for all the pull services and the run_service.
 prebuilt_image_override="$(plugin_read_config RUN_IMAGE)"
 for service_name in "${prebuilt_candidates[@]}" ; do
-  prebuilt_image=$(get_prebuilt_image "$service_name") || :
-
-  # override run_service prebuilt_image if set
   if [[ -n "$prebuilt_image_override" ]] && [[ "$service_name" == "$run_service" ]] ; then
+    echo "~~~ :docker: Overriding run image for $service_name"
     prebuilt_image="$prebuilt_image_override"
+  elif prebuilt_image=$(get_prebuilt_image "$service_name") ; then
+     echo "~~~ :docker: Found a pre-built image for $service_name"
   fi
 
   if [[ -n "$prebuilt_image" ]] ; then
-    echo "~~~ :docker: Found a pre-built image for $service_name"
     prebuilt_service_overrides+=("$service_name" "$prebuilt_image" "" 0 0)
     prebuilt_services+=("$service_name")
 

tests/run.bats

@@ -1281,27 +1281,21 @@ cmd3"
   unstub buildkite-agent
 }
 
-@test "Run wit a run image override" {
+@test "Run with a run image override" {
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_RUN=myservice
   export BUILDKITE_COMMAND="echo hello world"
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_RUN_IMAGE=docker.buildkite.com/myservice:123
-  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_CHECK_LINKED_CONTAINERS=false
-  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_CLEANUP=false
 
   stub docker \
     "compose -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml pull myservice : echo pulled myservice" \
     "compose -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml up -d --scale myservice=0 myservice : echo ran myservice dependencies" \
     "compose -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml run --name buildkite1111_myservice_build_1 -T --rm myservice /bin/sh -e -c 'echo hello world' : echo ran myservice"
 
-  stub buildkite-agent \
-    "meta-data exists docker-compose-plugin-built-image-tag-myservice : exit 1"
-
   run "$PWD"/hooks/command
 
   assert_success
   assert_output --partial "image: docker.buildkite.com/myservice:123"
   assert_output --partial "ran myservice"
 
   unstub docker
-  unstub buildkite-agent
 }