integration-cli: swarm.RestartNode(); don't load busybox again

thaJeztah · thaJeztah · commit 9419e62325ef · 2019-09-25T21:36:10.000+02:00
The daemon was already created and started with the busybox
image loaded, so there's no need to load the image again.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
(cherry picked from commit 8fc23588f1aa14054f1134e60dd996220c595363)
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
Upstream-commit: 55aadb3a8f5f66b526a67744159c286d4221e88f
Component: engine
diff --git a/components/engine/internal/test/daemon/swarm.go b/components/engine/internal/test/daemon/swarm.go
@@ -36,7 +36,7 @@ func (d *Daemon) RestartNode(t testingT) {
 	}
 	// avoid networking conflicts
 	d.Stop(t)
-	d.StartWithBusybox(t, startArgs...)
+	d.Start(t, startArgs...)
 }
 
 // StartAndSwarmInit starts the daemon (with busybox) and init the swarm

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func (d *Daemon) RestartNode(t testingT) {`
`36`	`36`	`}`
`37`	`37`	`// avoid networking conflicts`
`38`	`38`	`d.Stop(t)`
`39`		`- d.StartWithBusybox(t, startArgs...)`
	`39`	`+ d.Start(t, startArgs...)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`// StartAndSwarmInit starts the daemon (with busybox) and init the swarm`