tests: faster docker shutdown

Gauvain Pocentek · Gauvain Pocentek · commit d8db70768c27 · 2017-09-02T16:44:33.000+02:00
Kill the test container violently, no need to wait for a proper
shutdown.
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh
@@ -64,18 +64,12 @@ CONFIG=/tmp/python-gitlab.cfg
 
 cleanup() {
     rm -f "${CONFIG}"
-    log "Stopping gitlab-test docker container..."
-    docker stop gitlab-test >/dev/null &
-    docker_stop_pid=$!
-    log "Waiting for gitlab-test docker container to exit..."
-    docker wait gitlab-test >/dev/null
-    wait "${docker_stop_pid}"
-    log "Removing gitlab-test docker container..."
-    docker rm gitlab-test >/dev/null
     log "Deactivating Python virtualenv..."
     command -v deactivate >/dev/null 2>&1 && deactivate || true
     log "Deleting python virtualenv..."
     rm -rf "$VENV"
+    log "Stopping gitlab-test docker container..."
+    docker rm -f gitlab-test >/dev/null
     log "Done."
 }
 [ -z "${BUILD_TEST_ENV_AUTO_CLEANUP+set}" ] || {
