From b9167a9818eafbdedd930feadf57df36e408dd6c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 22 Dec 2018 14:37:38 +0100 Subject: [PATCH] Fix TestBuildWithSession, TestBuildSquashParent using wrong daemon during test These tests were spinning up a new daemon, but after the daemon was spun up, the default test-daemon was used by the client. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 9a3911ced83331b6efe698528a4480bd5ff3d7a6) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 605bc1ffc5adc5a3968ebe7a58060d2542cc28f3 Component: engine --- components/engine/integration/build/build_session_test.go | 2 +- components/engine/integration/build/build_squash_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/integration/build/build_session_test.go b/components/engine/integration/build/build_session_test.go index e1f5ae43ba..51559cbe11 100644 --- a/components/engine/integration/build/build_session_test.go +++ b/components/engine/integration/build/build_session_test.go @@ -27,7 +27,7 @@ func TestBuildWithSession(t *testing.T) { d.StartWithBusybox(t) defer d.Stop(t) - client := testEnv.APIClient() + client := d.NewClientT(t) dockerfile := ` FROM busybox diff --git a/components/engine/integration/build/build_squash_test.go b/components/engine/integration/build/build_squash_test.go index 8acdec596a..8326f2860c 100644 --- a/components/engine/integration/build/build_squash_test.go +++ b/components/engine/integration/build/build_squash_test.go @@ -26,7 +26,7 @@ func TestBuildSquashParent(t *testing.T) { d.StartWithBusybox(t) defer d.Stop(t) - client := testEnv.APIClient() + client := d.NewClientT(t) dockerfile := ` FROM busybox