docker-py: run without tty to disable color output

thaJeztah · thaJeztah · commit ebab8796cc17 · 2019-08-19T18:58:38.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
(cherry picked from commit b04cbf10722ec3de5b6ab4b822c6b271e0fd10c8)
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
Upstream-commit: 34fa29e8d410496ee614f5525dbb04732c319e80
Component: engine
diff --git a/components/engine/hack/make/test-docker-py b/components/engine/hack/make/test-docker-py
@@ -57,7 +57,7 @@ source hack/make/.integration-test-helpers
 	(
 		[ -n "${TESTDEBUG}" ] && set -x
 		# shellcheck disable=SC2086
-		exec docker run -t --rm ${run_opts} "${docker_py_image}" pytest ${PY_TEST_OPTIONS} tests/integration
+		exec docker run --rm ${run_opts} "${docker_py_image}" pytest ${PY_TEST_OPTIONS} tests/integration
 	)
 	bundle .integration-daemon-stop
 ) 2>&1 | tee -a "$DEST/test.log"

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ source hack/make/.integration-test-helpers`
`57`	`57`	`(`
`58`	`58`	`[ -n "${TESTDEBUG}" ] && set -x`
`59`	`59`	`# shellcheck disable=SC2086`
`60`		`- exec docker run -t --rm ${run_opts} "${docker_py_image}" pytest ${PY_TEST_OPTIONS} tests/integration`
	`60`	`+ exec docker run --rm ${run_opts} "${docker_py_image}" pytest ${PY_TEST_OPTIONS} tests/integration`
`61`	`61`	`)`
`62`	`62`	`bundle .integration-daemon-stop`
`63`	`63`	`) 2>&1 \| tee -a "$DEST/test.log"`