Merge pull request #7191 from tiborvass/test-daemon

Add Daemon restart test along with Daemon utils

hack/make.sh

@@ -156,6 +156,7 @@ go_test_dir() {
 		testcover=( -cover -coverprofile "$coverprofile" $coverpkg )
 	fi
 	(
+		export DEST
 		echo '+ go test' $TESTFLAGS "${DOCKER_PKG}${dir#.}"
 		cd "$dir"
 		go test ${testcover[@]} -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" $TESTFLAGS

hack/make/test-integration-cli

@@ -38,7 +38,9 @@ exec > >(tee -a $DEST/test.log) 2>&1
 
 	bundle_test_integration_cli
 
-	DOCKERD_PID=$(set -x; cat $DEST/docker.pid)
-	( set -x; kill $DOCKERD_PID )
-	wait $DOCKERD_PID || true
+	for pid in $(find "$DEST" -name docker.pid); do
+		DOCKER_PID=$(set -x; cat "$pid")
+		( set -x; kill $DOCKER_PID )
+		wait $DOCKERD_PID || true
+	done
 )