Browse Source

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 <github@gone.nl>
Sebastiaan van Stijn 6 years ago
parent
commit
ae3ca7bb97
1 changed files with 9 additions and 2 deletions
  1. 9 2
      integration/image/import_test.go

+ 9 - 2
integration/image/import_test.go

@@ -9,17 +9,24 @@ import (
 	"testing"
 	"testing"
 
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/internal/test/daemon"
 	"github.com/docker/docker/internal/testutil"
 	"github.com/docker/docker/internal/testutil"
 	"gotest.tools/skip"
 	"gotest.tools/skip"
 )
 )
 
 
 // Ensure we don't regress on CVE-2017-14992.
 // Ensure we don't regress on CVE-2017-14992.
 func TestImportExtremelyLargeImageWorks(t *testing.T) {
 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, runtime.GOARCH == "arm64", "effective test will be time out")
 	skip.If(t, testEnv.OSType == "windows", "TODO enable on windows")
 	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
 	// 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
 	// end. This should not cause any crashes (the padding should be mostly