From ae3ca7bb9768c8136db373ccad95142168dae287 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 3 Jan 2019 12:09:24 +0100 Subject: [PATCH] Run TestImportExtremelyLargeImageWorks in parallel This is a slow test, taking over two minutes to complete, so spin up a new daemon for this test and run it in parallel Signed-off-by: Sebastiaan van Stijn --- integration/image/import_test.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/integration/image/import_test.go b/integration/image/import_test.go index 3c47099920..6198c2048f 100644 --- a/integration/image/import_test.go +++ b/integration/image/import_test.go @@ -9,17 +9,24 @@ import ( "testing" "github.com/docker/docker/api/types" + "github.com/docker/docker/internal/test/daemon" "github.com/docker/docker/internal/testutil" "gotest.tools/skip" ) // Ensure we don't regress on CVE-2017-14992. func TestImportExtremelyLargeImageWorks(t *testing.T) { + skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon") skip.If(t, runtime.GOARCH == "arm64", "effective test will be time out") skip.If(t, testEnv.OSType == "windows", "TODO enable on windows") + t.Parallel() - defer setupTest(t)() - client := testEnv.APIClient() + // Spin up a new daemon, so that we can run this test in parallel (it's a slow test) + d := daemon.New(t) + d.Start(t) + defer d.Stop(t) + + client := d.NewClientT(t) // Construct an empty tar archive with about 8GB of junk padding at the // end. This should not cause any crashes (the padding should be mostly