@@ -84,7 +84,7 @@ func (s *DockerRegistrySuite) TearDownTest(c *check.C) {

 		s.reg.Close()

 	}

 	if s.d != nil {

-		s.d.Stop()

+		s.d.Stop(c)

 	}

 	s.ds.TearDownTest(c)

 }

@@ -118,7 +118,7 @@ func (s *DockerSchema1RegistrySuite) TearDownTest(c *check.C) {

 		s.reg.Close()

 	}

 	if s.d != nil {

-		s.d.Stop()

+		s.d.Stop(c)

 	}

 	s.ds.TearDownTest(c)

 }

@@ -154,7 +154,7 @@ func (s *DockerRegistryAuthHtpasswdSuite) TearDownTest(c *check.C) {

 		s.reg.Close()

 	}

 	if s.d != nil {

-		s.d.Stop()

+		s.d.Stop(c)

 	}

 	s.ds.TearDownTest(c)

 }

@@ -189,7 +189,7 @@ func (s *DockerRegistryAuthTokenSuite) TearDownTest(c *check.C) {

 		s.reg.Close()

 	}

 	if s.d != nil {

-		s.d.Stop()

+		s.d.Stop(c)

 	}

 	s.ds.TearDownTest(c)

 }

@@ -226,7 +226,7 @@ func (s *DockerDaemonSuite) SetUpTest(c *check.C) {

 func (s *DockerDaemonSuite) TearDownTest(c *check.C) {

 	testRequires(c, DaemonIsLinux)

 	if s.d != nil {

-		s.d.Stop()

+		s.d.Stop(c)

 	}

 	s.ds.TearDownTest(c)

 }

@@ -283,8 +283,7 @@ func (s *DockerSwarmSuite) AddDaemon(c *check.C, joinSwarm, manager bool) *daemo

 	}

 	d.ListenAddr = fmt.Sprintf("0.0.0.0:%d", d.Port)

 	args := []string{"--iptables=false", "--swarm-default-advertise-addr=lo"} // avoid networking conflicts

-	err := d.StartWithBusybox(args...)

-	c.Assert(err, check.IsNil)

+	d.StartWithBusybox(c, args...)

 	if joinSwarm == true {

 		if len(s.daemons) > 0 {

@@ -315,7 +314,7 @@ func (s *DockerSwarmSuite) TearDownTest(c *check.C) {

 	s.daemonsLock.Lock()

 	for _, d := range s.daemons {

 		if d != nil {

-			d.Stop()

+			d.Stop(c)

 			// FIXME(vdemeester) should be handled by SwarmDaemon ?

 			// raft state file is quite big (64MB) so remove it after every test

 			walDir := filepath.Join(d.Root, "swarm/raft/wal")

@@ -34,6 +34,8 @@ import (

 // SockRoot holds the path of the default docker integration daemon socket

 var SockRoot = filepath.Join(os.TempDir(), "docker-integration")

+var errDaemonNotStarted = errors.New("daemon not started")

+

 // Daemon represents a Docker daemon for the testing framework.

 type Daemon struct {

 	GlobalFlags       []string

@@ -171,9 +173,14 @@ func (d *Daemon) getClientConfig() (*clientConfig, error) {

 	}, nil

 }

-// Start will start the daemon and return once it is ready to receive requests.

-// You can specify additional daemon flags.

-func (d *Daemon) Start(args ...string) error {

+// Start starts the daemon and return once it is ready to receive requests.

+func (d *Daemon) Start(c *check.C, args ...string) {

+	c.Assert(d.StartWithError(args...), checker.IsNil, check.Commentf("Error starting daemon with arguments: %v", args))

+}

+

+// StartWithError starts the daemon and return once it is ready to receive requests.

+// It returns an error in case it couldn't start.

+func (d *Daemon) StartWithError(args ...string) error {

 	logFile, err := os.OpenFile(filepath.Join(d.Folder, "docker.log"), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0600)

 	if err != nil {

 		return errors.Wrapf(err, "[%s] Could not create %s/docker.log", d.id, d.Folder)

@@ -295,17 +302,15 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error {

 // StartWithBusybox will first start the daemon with Daemon.Start()

 // then save the busybox image from the main daemon and load it into this Daemon instance.

-func (d *Daemon) StartWithBusybox(arg ...string) error {

-	if err := d.Start(arg...); err != nil {

-		return err

-	}

-	return d.LoadBusybox()

+func (d *Daemon) StartWithBusybox(c *check.C, arg ...string) {

+	d.Start(c, arg...)

+	c.Assert(d.LoadBusybox(), checker.IsNil, check.Commentf("Error loading busybox image to current daeom: %s", d.id))

 }

 // Kill will send a SIGKILL to the daemon

 func (d *Daemon) Kill() error {

 	if d.cmd == nil || d.Wait == nil {

-		return errors.New("daemon not started")

+		return errDaemonNotStarted

 	}

 	defer func() {

@@ -337,7 +342,7 @@ func (d *Daemon) Interrupt() error {

 // Signal sends the specified signal to the daemon if running

 func (d *Daemon) Signal(signal os.Signal) error {

 	if d.cmd == nil || d.Wait == nil {

-		return errors.New("daemon not started")

+		return errDaemonNotStarted

 	}

 	return d.cmd.Process.Signal(signal)

 }

@@ -353,12 +358,28 @@ func (d *Daemon) DumpStackAndQuit() {

 }

 // Stop will send a SIGINT every second and wait for the daemon to stop.

+// If it times out, a SIGKILL is sent.

+// Stop will not delete the daemon directory. If a purged daemon is needed,

+// instantiate a new one with NewDaemon.

+// If an error occurs while starting the daemon, the test will fail.

+func (d *Daemon) Stop(c *check.C) {

+	err := d.StopWithError()

+	if err != nil {

+		if err != errDaemonNotStarted {

+			c.Fatalf("Error while stopping the daemon %s : %v", d.id, err)

+		} else {

+			c.Logf("Daemon %s is not started", d.id)

+		}

+	}

+}

+

+// StopWithError will send a SIGINT every second and wait for the daemon to stop.

 // If it timeouts, a SIGKILL is sent.

 // Stop will not delete the daemon directory. If a purged daemon is needed,

 // instantiate a new one with NewDaemon.

-func (d *Daemon) Stop() error {

+func (d *Daemon) StopWithError() error {

 	if d.cmd == nil || d.Wait == nil {

-		return errors.New("daemon not started")

+		return errDaemonNotStarted

 	}

 	defer func() {

@@ -370,6 +391,9 @@ func (d *Daemon) Stop() error {

 	tick := time.Tick(time.Second)

 	if err := d.cmd.Process.Signal(os.Interrupt); err != nil {

+		if strings.Contains(err.Error(), "os: process already finished") {

+			return errDaemonNotStarted

+		}

 		return errors.Errorf("could not send signal: %v", err)

 	}

 out1:

@@ -414,9 +438,24 @@ out2:

 	return nil

 }

-// Restart will restart the daemon by first stopping it and then starting it.

-func (d *Daemon) Restart(arg ...string) error {

-	d.Stop()

+// Restart will restart the daemon by first stopping it and the starting it.

+// If an error occurs while starting the daemon, the test will fail.

+func (d *Daemon) Restart(c *check.C, args ...string) {

+	d.Stop(c)

+	d.handleUserns()

+	d.Start(c, args...)

+}

+

+// RestartWithError will restart the daemon by first stopping it and then starting it.

+func (d *Daemon) RestartWithError(arg ...string) error {

+	if err := d.StopWithError(); err != nil {

+		return err

+	}

+	d.handleUserns()

+	return d.StartWithError(arg...)

+}

+

+func (d *Daemon) handleUserns() {

 	// in the case of tests running a user namespace-enabled daemon, we have resolved

 	// d.Root to be the actual final path of the graph dir after the "uid.gid" of

 	// remapped root is added--we need to subtract it from the path before calling

@@ -425,7 +464,6 @@ func (d *Daemon) Restart(arg ...string) error {

 	if root := os.Getenv("DOCKER_REMAP_ROOT"); root != "" {

 		d.Root = filepath.Dir(d.Root)

 	}

-	return d.Start(arg...)

 }

 // LoadBusybox will load the stored busybox into a newly started daemon

@@ -51,15 +51,11 @@ func (s *DockerSwarmSuite) TestAPISwarmInit(c *check.C) {

 	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)

 	// Current state restoring after restarts

-	err = d1.Stop()

-	c.Assert(err, checker.IsNil)

-	err = d2.Stop()

-	c.Assert(err, checker.IsNil)

+	d1.Stop(c)

+	d2.Stop(c)

-	err = d1.Start()

-	c.Assert(err, checker.IsNil)

-	err = d2.Start()

-	c.Assert(err, checker.IsNil)

+	d1.Start(c)

+	d2.Start(c)

 	info, err = d1.SwarmInfo()

 	c.Assert(err, checker.IsNil)

@@ -240,7 +236,7 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesMultipleAgents(c *check.C) {

 	waitAndAssert(c, defaultReconciliationTimeout, reducedCheck(sumAsIntegers, d1.CheckActiveContainerCount, d2.CheckActiveContainerCount, d3.CheckActiveContainerCount), checker.Equals, instances)

 	// reconciliation on d2 node down

-	c.Assert(d2.Stop(), checker.IsNil)

+	d2.Stop(c)

 	waitAndAssert(c, defaultReconciliationTimeout, reducedCheck(sumAsIntegers, d1.CheckActiveContainerCount, d3.CheckActiveContainerCount), checker.Equals, instances)

@@ -629,7 +625,7 @@ func (s *DockerSwarmSuite) TestAPISwarmLeaderElection(c *check.C) {

 	c.Assert(d1.GetNode(c, d2.NodeID).ManagerStatus.Leader, checker.False)

 	c.Assert(d1.GetNode(c, d3.NodeID).ManagerStatus.Leader, checker.False)

-	d1.Stop() // stop the leader

+	d1.Stop(c)

 	var (

 		leader    *daemon.Swarm   // keep track of leader

@@ -666,7 +662,7 @@ func (s *DockerSwarmSuite) TestAPISwarmLeaderElection(c *check.C) {

 	stableleader := leader

 	// add the d1, the initial leader, back

-	d1.Start()

+	d1.Start(c)

 	// TODO(stevvooe): may need to wait for rejoin here

@@ -688,7 +684,7 @@ func (s *DockerSwarmSuite) TestAPISwarmRaftQuorum(c *check.C) {

 	d1.CreateService(c, simpleTestService)

-	c.Assert(d2.Stop(), checker.IsNil)

+	d2.Stop(c)

 	// make sure there is a leader

 	waitAndAssert(c, defaultReconciliationTimeout, d1.CheckLeader, checker.IsNil)

@@ -697,7 +693,7 @@ func (s *DockerSwarmSuite) TestAPISwarmRaftQuorum(c *check.C) {

 		s.Spec.Name = "top1"

 	})

-	c.Assert(d3.Stop(), checker.IsNil)

+	d3.Stop(c)

 	// make sure there is a leader

 	waitAndAssert(c, defaultReconciliationTimeout, d1.CheckLeader, checker.IsNil)

@@ -709,7 +705,7 @@ func (s *DockerSwarmSuite) TestAPISwarmRaftQuorum(c *check.C) {

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusInternalServerError, check.Commentf("deadline exceeded", string(out)))

-	c.Assert(d2.Start(), checker.IsNil)

+	d2.Start(c)

 	// make sure there is a leader

 	waitAndAssert(c, defaultReconciliationTimeout, d1.CheckLeader, checker.IsNil)

@@ -771,8 +767,7 @@ func (s *DockerSwarmSuite) TestAPISwarmNodeRemove(c *check.C) {

 	c.Assert(len(nodes), checker.Equals, 2, check.Commentf("nodes: %#v", nodes))

 	// Restart the node that was removed

-	err = d2.Restart()

-	c.Assert(err, checker.IsNil)

+	d2.Restart(c)

 	// Give some time for the node to rejoin

 	time.Sleep(1 * time.Second)

@@ -899,8 +894,8 @@ func (s *DockerSwarmSuite) TestAPISwarmRestoreOnPendingJoin(c *check.C) {

 	waitAndAssert(c, defaultReconciliationTimeout, d.CheckLocalNodeState, checker.Equals, swarm.LocalNodeStatePending)

-	c.Assert(d.Stop(), checker.IsNil)

-	c.Assert(d.Start(), checker.IsNil)

+	d.Stop(c)

+	d.Start(c)

 	info, err := d.SwarmInfo()

 	c.Assert(err, checker.IsNil)

@@ -914,25 +909,25 @@ func (s *DockerSwarmSuite) TestAPISwarmManagerRestore(c *check.C) {

 	id := d1.CreateService(c, simpleTestService, setInstances(instances))

 	d1.GetService(c, id)

-	d1.Stop()

-	d1.Start()

+	d1.Stop(c)

+	d1.Start(c)

 	d1.GetService(c, id)

 	d2 := s.AddDaemon(c, true, true)

 	d2.GetService(c, id)

-	d2.Stop()

-	d2.Start()

+	d2.Stop(c)

+	d2.Start(c)

 	d2.GetService(c, id)

 	d3 := s.AddDaemon(c, true, true)

 	d3.GetService(c, id)

-	d3.Stop()

-	d3.Start()

+	d3.Stop(c)

+	d3.Start(c)

 	d3.GetService(c, id)

 	d3.Kill()

 	time.Sleep(1 * time.Second) // time to handle signal

-	d3.Start()

+	d3.Start(c)

 	d3.GetService(c, id)

 }

@@ -993,7 +988,7 @@ func (s *DockerSwarmSuite) TestAPISwarmForceNewCluster(c *check.C) {

 	waitAndAssert(c, defaultReconciliationTimeout, d1.CheckActiveContainerCount, checker.Equals, instances)

 	waitAndAssert(c, defaultReconciliationTimeout, d2.CheckActiveContainerCount, checker.Equals, 0)

-	c.Assert(d2.Stop(), checker.IsNil)

+	d2.Stop(c)

 	c.Assert(d1.Init(swarm.InitRequest{

 		ForceNewCluster: true,

@@ -1210,7 +1205,7 @@ func (s *DockerSwarmSuite) TestAPISwarmRestartCluster(c *check.C) {

 		for _, d := range nodes {

 			go func(daemon *daemon.Swarm) {

 				defer wg.Done()

-				if err := daemon.Stop(); err != nil {

+				if err := daemon.StopWithError(); err != nil {

 					errs <- err

 				}

 				// FIXME(vdemeester) This is duplicated…

@@ -1235,7 +1230,7 @@ func (s *DockerSwarmSuite) TestAPISwarmRestartCluster(c *check.C) {

 		for _, d := range nodes {

 			go func(daemon *daemon.Swarm) {

 				defer wg.Done()

-				if err := daemon.Start("--iptables=false"); err != nil {

+				if err := daemon.StartWithError("--iptables=false"); err != nil {

 					errs <- err

 				}

 			}(d)

@@ -35,12 +35,12 @@ func (s *DockerAuthzV2Suite) SetUpTest(c *check.C) {

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

 		Experimental: experimentalDaemon,

 	})

-	c.Assert(s.d.Start(), check.IsNil)

+	s.d.Start(c)

 }

 func (s *DockerAuthzV2Suite) TearDownTest(c *check.C) {

 	if s.d != nil {

-		s.d.Stop()

+		s.d.Stop(c)

 		s.ds.TearDownTest(c)

 	}

 }

@@ -52,12 +52,12 @@ func (s *DockerAuthzV2Suite) TestAuthZPluginAllowNonVolumeRequest(c *check.C) {

 	c.Assert(err, checker.IsNil)

 	// start the daemon with the plugin and load busybox, --net=none build fails otherwise

 	// because it needs to pull busybox

-	c.Assert(s.d.Restart("--authorization-plugin="+authzPluginNameWithTag), check.IsNil)

+	s.d.Restart(c, "--authorization-plugin="+authzPluginNameWithTag)

 	c.Assert(s.d.LoadBusybox(), check.IsNil)

 	// defer disabling the plugin

 	defer func() {

-		c.Assert(s.d.Restart(), check.IsNil)

+		s.d.Restart(c)

 		_, err = s.d.Cmd("plugin", "disable", authzPluginNameWithTag)

 		c.Assert(err, checker.IsNil)

 		_, err = s.d.Cmd("plugin", "rm", authzPluginNameWithTag)

@@ -82,11 +82,11 @@ func (s *DockerAuthzV2Suite) TestAuthZPluginRejectVolumeRequests(c *check.C) {

 	c.Assert(err, checker.IsNil)

 	// restart the daemon with the plugin

-	c.Assert(s.d.Restart("--authorization-plugin="+authzPluginNameWithTag), check.IsNil)

+	s.d.Restart(c, "--authorization-plugin="+authzPluginNameWithTag)

 	// defer disabling the plugin

 	defer func() {

-		c.Assert(s.d.Restart(), check.IsNil)

+		s.d.Restart(c)

 		_, err = s.d.Cmd("plugin", "disable", authzPluginNameWithTag)

 		c.Assert(err, checker.IsNil)

 		_, err = s.d.Cmd("plugin", "rm", authzPluginNameWithTag)

@@ -121,16 +121,16 @@ func (s *DockerAuthzV2Suite) TestAuthZPluginBadManifestFailsDaemonStart(c *check

 	c.Assert(err, checker.IsNil)

 	// start the daemon with the plugin, it will error

-	c.Assert(s.d.Restart("--authorization-plugin="+authzPluginBadManifestName), check.NotNil)

+	c.Assert(s.d.RestartWithError("--authorization-plugin="+authzPluginBadManifestName), check.NotNil)

 	// restarting the daemon without requiring the plugin will succeed

-	c.Assert(s.d.Restart(), check.IsNil)

+	s.d.Restart(c)

 }

 func (s *DockerAuthzV2Suite) TestNonexistentAuthZPluginFailsDaemonStart(c *check.C) {

 	// start the daemon with a non-existent authz plugin, it will error

-	c.Assert(s.d.Restart("--authorization-plugin="+nonexistentAuthzPluginName), check.NotNil)

+	c.Assert(s.d.RestartWithError("--authorization-plugin="+nonexistentAuthzPluginName), check.NotNil)

 	// restarting the daemon without requiring the plugin will succeed

-	c.Assert(s.d.Restart(), check.IsNil)

+	s.d.Start(c)

 }

@@ -72,7 +72,7 @@ func (s *DockerAuthzSuite) SetUpTest(c *check.C) {

 func (s *DockerAuthzSuite) TearDownTest(c *check.C) {

 	if s.d != nil {

-		s.d.Stop()

+		s.d.Stop(c)

 		s.ds.TearDownTest(c)

 		s.ctrl = nil

 	}

@@ -206,7 +206,7 @@ func (s *DockerAuthzSuite) TearDownSuite(c *check.C) {

 func (s *DockerAuthzSuite) TestAuthZPluginAllowRequest(c *check.C) {

 	// start the daemon and load busybox, --net=none build fails otherwise

 	// cause it needs to pull busybox

-	c.Assert(s.d.Start("--authorization-plugin="+testAuthZPlugin), check.IsNil)

+	s.d.Start(c, "--authorization-plugin="+testAuthZPlugin)

 	s.ctrl.reqRes.Allow = true

 	s.ctrl.resRes.Allow = true

 	c.Assert(s.d.LoadBusybox(), check.IsNil)

@@ -231,7 +231,7 @@ func (s *DockerAuthzSuite) TestAuthZPluginTls(c *check.C) {

 	const testDaemonHTTPSAddr = "tcp://localhost:4271"

 	// start the daemon and load busybox, --net=none build fails otherwise

 	// cause it needs to pull busybox

-	if err := s.d.Start(

+	s.d.Start(c,

 		"--authorization-plugin="+testAuthZPlugin,

 		"--tlsverify",

 		"--tlscacert",

@@ -240,9 +240,7 @@ func (s *DockerAuthzSuite) TestAuthZPluginTls(c *check.C) {

 		"fixtures/https/server-cert.pem",

 		"--tlskey",

 		"fixtures/https/server-key.pem",

-		"-H", testDaemonHTTPSAddr); err != nil {

-		c.Fatalf("Could not start daemon with busybox: %v", err)

-	}

+		"-H", testDaemonHTTPSAddr)

 	s.ctrl.reqRes.Allow = true

 	s.ctrl.resRes.Allow = true

@@ -266,8 +264,7 @@ func (s *DockerAuthzSuite) TestAuthZPluginTls(c *check.C) {

 }

 func (s *DockerAuthzSuite) TestAuthZPluginDenyRequest(c *check.C) {

-	err := s.d.Start("--authorization-plugin=" + testAuthZPlugin)

-	c.Assert(err, check.IsNil)

+	s.d.Start(c, "--authorization-plugin="+testAuthZPlugin)

 	s.ctrl.reqRes.Allow = false

 	s.ctrl.reqRes.Msg = unauthorizedMessage

@@ -283,8 +280,7 @@ func (s *DockerAuthzSuite) TestAuthZPluginDenyRequest(c *check.C) {

 // TestAuthZPluginAPIDenyResponse validates that when authorization plugin deny the request, the status code is forbidden

 func (s *DockerAuthzSuite) TestAuthZPluginAPIDenyResponse(c *check.C) {

-	err := s.d.Start("--authorization-plugin=" + testAuthZPlugin)

-	c.Assert(err, check.IsNil)

+	s.d.Start(c, "--authorization-plugin="+testAuthZPlugin)

 	s.ctrl.reqRes.Allow = false

 	s.ctrl.resRes.Msg = unauthorizedMessage

@@ -303,8 +299,7 @@ func (s *DockerAuthzSuite) TestAuthZPluginAPIDenyResponse(c *check.C) {

 }

 func (s *DockerAuthzSuite) TestAuthZPluginDenyResponse(c *check.C) {

-	err := s.d.Start("--authorization-plugin=" + testAuthZPlugin)

-	c.Assert(err, check.IsNil)

+	s.d.Start(c, "--authorization-plugin="+testAuthZPlugin)

 	s.ctrl.reqRes.Allow = true

 	s.ctrl.resRes.Allow = false

 	s.ctrl.resRes.Msg = unauthorizedMessage

@@ -324,7 +319,7 @@ func (s *DockerAuthzSuite) TestAuthZPluginAllowEventStream(c *check.C) {

 	testRequires(c, DaemonIsLinux)

 	// start the daemon and load busybox to avoid pulling busybox from Docker Hub

-	c.Assert(s.d.Start("--authorization-plugin="+testAuthZPlugin), check.IsNil)

+	s.d.Start(c, "--authorization-plugin="+testAuthZPlugin)

 	s.ctrl.reqRes.Allow = true

 	s.ctrl.resRes.Allow = true

 	c.Assert(s.d.LoadBusybox(), check.IsNil)

@@ -383,8 +378,7 @@ func (s *DockerAuthzSuite) TestAuthZPluginAllowEventStream(c *check.C) {

 }

 func (s *DockerAuthzSuite) TestAuthZPluginErrorResponse(c *check.C) {

-	err := s.d.Start("--authorization-plugin=" + testAuthZPlugin)

-	c.Assert(err, check.IsNil)

+	s.d.Start(c, "--authorization-plugin="+testAuthZPlugin)

 	s.ctrl.reqRes.Allow = true

 	s.ctrl.resRes.Err = errorMessage

@@ -396,8 +390,7 @@ func (s *DockerAuthzSuite) TestAuthZPluginErrorResponse(c *check.C) {

 }

 func (s *DockerAuthzSuite) TestAuthZPluginErrorRequest(c *check.C) {

-	err := s.d.Start("--authorization-plugin=" + testAuthZPlugin)

-	c.Assert(err, check.IsNil)

+	s.d.Start(c, "--authorization-plugin="+testAuthZPlugin)

 	s.ctrl.reqRes.Err = errorMessage

 	// Ensure command is blocked

@@ -408,7 +401,7 @@ func (s *DockerAuthzSuite) TestAuthZPluginErrorRequest(c *check.C) {

 }

 func (s *DockerAuthzSuite) TestAuthZPluginEnsureNoDuplicatePluginRegistration(c *check.C) {

-	c.Assert(s.d.Start("--authorization-plugin="+testAuthZPlugin, "--authorization-plugin="+testAuthZPlugin), check.IsNil)

+	s.d.Start(c, "--authorization-plugin="+testAuthZPlugin, "--authorization-plugin="+testAuthZPlugin)

 	s.ctrl.reqRes.Allow = true

 	s.ctrl.resRes.Allow = true

@@ -422,7 +415,7 @@ func (s *DockerAuthzSuite) TestAuthZPluginEnsureNoDuplicatePluginRegistration(c

 }

 func (s *DockerAuthzSuite) TestAuthZPluginEnsureLoadImportWorking(c *check.C) {

-	c.Assert(s.d.Start("--authorization-plugin="+testAuthZPlugin, "--authorization-plugin="+testAuthZPlugin), check.IsNil)

+	s.d.Start(c, "--authorization-plugin="+testAuthZPlugin, "--authorization-plugin="+testAuthZPlugin)

 	s.ctrl.reqRes.Allow = true

 	s.ctrl.resRes.Allow = true

 	c.Assert(s.d.LoadBusybox(), check.IsNil)

@@ -449,7 +442,7 @@ func (s *DockerAuthzSuite) TestAuthZPluginEnsureLoadImportWorking(c *check.C) {

 }

 func (s *DockerAuthzSuite) TestAuthZPluginHeader(c *check.C) {

-	c.Assert(s.d.Start("--debug", "--authorization-plugin="+testAuthZPlugin), check.IsNil)

+	s.d.Start(c, "--debug", "--authorization-plugin="+testAuthZPlugin)

 	s.ctrl.reqRes.Allow = true

 	s.ctrl.resRes.Allow = true

 	c.Assert(s.d.LoadBusybox(), check.IsNil)

@@ -18,9 +18,7 @@ import (

 func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) {

 	testRequires(c, Network)

-	if err := s.d.Start(); err != nil {

-		c.Fatalf("Could not start daemon: %v", err)

-	}

+	s.d.Start(c)

 	if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {

 		c.Fatalf("Could not install plugin: %v %s", err, out)

@@ -35,9 +33,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) {

 		}

 	}()

-	if err := s.d.Restart(); err != nil {

-		c.Fatalf("Could not restart daemon: %v", err)

-	}

+	s.d.Restart(c)

 	out, err := s.d.Cmd("plugin", "ls")

 	if err != nil {

@@ -51,9 +47,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) {

 func (s *DockerDaemonSuite) TestDaemonRestartWithPluginDisabled(c *check.C) {

 	testRequires(c, Network)

-	if err := s.d.Start(); err != nil {

-		c.Fatalf("Could not start daemon: %v", err)

-	}

+	s.d.Start(c)

 	if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName, "--disable"); err != nil {

 		c.Fatalf("Could not install plugin: %v %s", err, out)

@@ -65,9 +59,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginDisabled(c *check.C) {

 		}

 	}()

-	if err := s.d.Restart(); err != nil {

-		c.Fatalf("Could not restart daemon: %v", err)

-	}

+	s.d.Restart(c)

 	out, err := s.d.Cmd("plugin", "ls")

 	if err != nil {

@@ -82,16 +74,12 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginDisabled(c *check.C) {

 func (s *DockerDaemonSuite) TestDaemonKillLiveRestoreWithPlugins(c *check.C) {

 	testRequires(c, Network, IsAmd64)

-	if err := s.d.Start("--live-restore"); err != nil {

-		c.Fatalf("Could not start daemon: %v", err)

-	}

+	s.d.Start(c, "--live-restore")

 	if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {

 		c.Fatalf("Could not install plugin: %v %s", err, out)

 	}

 	defer func() {

-		if err := s.d.Restart("--live-restore"); err != nil {

-			c.Fatalf("Could not restart daemon: %v", err)

-		}

+		s.d.Restart(c, "--live-restore")

 		if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {

 			c.Fatalf("Could not disable plugin: %v %s", err, out)

 		}

@@ -115,16 +103,12 @@ func (s *DockerDaemonSuite) TestDaemonKillLiveRestoreWithPlugins(c *check.C) {

 func (s *DockerDaemonSuite) TestDaemonShutdownLiveRestoreWithPlugins(c *check.C) {

 	testRequires(c, Network, IsAmd64)

-	if err := s.d.Start("--live-restore"); err != nil {

-		c.Fatalf("Could not start daemon: %v", err)

-	}

+	s.d.Start(c, "--live-restore")

 	if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {

 		c.Fatalf("Could not install plugin: %v %s", err, out)

 	}

 	defer func() {

-		if err := s.d.Restart("--live-restore"); err != nil {

-			c.Fatalf("Could not restart daemon: %v", err)

-		}

+		s.d.Restart(c, "--live-restore")

 		if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {

 			c.Fatalf("Could not disable plugin: %v %s", err, out)

 		}

@@ -147,17 +131,13 @@ func (s *DockerDaemonSuite) TestDaemonShutdownLiveRestoreWithPlugins(c *check.C)

 func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) {

 	testRequires(c, Network)

-	if err := s.d.Start(); err != nil {

-		c.Fatalf("Could not start daemon: %v", err)

-	}

+	s.d.Start(c)

 	if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {

 		c.Fatalf("Could not install plugin: %v %s", err, out)

 	}

 	defer func() {

-		if err := s.d.Restart(); err != nil {

-			c.Fatalf("Could not restart daemon: %v", err)

-		}

+		s.d.Restart(c)

 		if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {

 			c.Fatalf("Could not disable plugin: %v %s", err, out)

 		}

@@ -190,9 +170,7 @@ func (s *DockerDaemonSuite) TestVolumePlugin(c *check.C) {

 	destDir := "/tmp/data/"

 	destFile := "foo"

-	if err := s.d.Start(); err != nil {

-		c.Fatalf("Could not start daemon: %v", err)

-	}

+	s.d.Start(c)

 	out, err := s.d.Cmd("plugin", "install", pName, "--grant-all-permissions")

 	if err != nil {

 		c.Fatalf("Could not install plugin: %v %s", err, out)

@@ -43,9 +43,7 @@ func (s *DockerDaemonSuite) TestLegacyDaemonCommand(c *check.C) {

 }

 func (s *DockerDaemonSuite) TestDaemonRestartWithRunningContainersPorts(c *check.C) {

-	if err := s.d.StartWithBusybox(); err != nil {

-		c.Fatalf("Could not start daemon with busybox: %v", err)

-	}

+	s.d.StartWithBusybox(c)

 	if out, err := s.d.Cmd("run", "-d", "--name", "top1", "-p", "1234:80", "--restart", "always", "busybox:latest", "top"); err != nil {

 		c.Fatalf("Could not run top1: err=%v\n%s", err, out)

@@ -75,24 +73,18 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithRunningContainersPorts(c *check

 	testRun(map[string]bool{"top1": true, "top2": true}, "")

-	if err := s.d.Restart(); err != nil {

-		c.Fatalf("Could not restart daemon: %v", err)

-	}

+	s.d.Restart(c)

 	testRun(map[string]bool{"top1": true, "top2": false}, "After daemon restart: ")

 }

 func (s *DockerDaemonSuite) TestDaemonRestartWithVolumesRefs(c *check.C) {

-	if err := s.d.StartWithBusybox(); err != nil {

-		c.Fatal(err)

-	}

+	s.d.StartWithBusybox(c)

 	if out, err := s.d.Cmd("run", "--name", "volrestarttest1", "-v", "/foo", "busybox"); err != nil {

 		c.Fatal(err, out)

 	}

-	if err := s.d.Restart(); err != nil {

-		c.Fatal(err)

-	}

+	s.d.Restart(c)

 	if _, err := s.d.Cmd("run", "-d", "--volumes-from", "volrestarttest1", "--name", "volrestarttest2", "busybox", "top"); err != nil {

 		c.Fatal(err)

@@ -112,8 +104,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithVolumesRefs(c *check.C) {

 // #11008

 func (s *DockerDaemonSuite) TestDaemonRestartUnlessStopped(c *check.C) {

-	err := s.d.StartWithBusybox()

-	c.Assert(err, check.IsNil)

+	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("run", "-d", "--name", "top1", "--restart", "always", "busybox:latest", "top")

 	c.Assert(err, check.IsNil, check.Commentf("run top1: %v", out))

@@ -147,8 +138,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartUnlessStopped(c *check.C) {

 	// both stopped

 	testRun(map[string]bool{"top1": false, "top2": false}, "")

-	err = s.d.Restart()

-	c.Assert(err, check.IsNil)

+	s.d.Restart(c)

 	// restart=always running

 	testRun(map[string]bool{"top1": true, "top2": false}, "After daemon restart: ")

@@ -156,8 +146,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartUnlessStopped(c *check.C) {

 	out, err = s.d.Cmd("start", "top2")

 	c.Assert(err, check.IsNil, check.Commentf("start top2: %v", out))

-	err = s.d.Restart()

-	c.Assert(err, check.IsNil)

+	s.d.Restart(c)

 	// both running

 	testRun(map[string]bool{"top1": true, "top2": true}, "After second daemon restart: ")

@@ -165,8 +154,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartUnlessStopped(c *check.C) {

 }

 func (s *DockerDaemonSuite) TestDaemonRestartOnFailure(c *check.C) {

-	err := s.d.StartWithBusybox()

-	c.Assert(err, check.IsNil)

+	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("run", "-d", "--name", "test1", "--restart", "on-failure:3", "busybox:latest", "false")

 	c.Assert(err, check.IsNil, check.Commentf("run top1: %v", out))

@@ -181,8 +169,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartOnFailure(c *check.C) {

 	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))

 	lastStartTime := out

-	err = s.d.Restart()

-	c.Assert(err, check.IsNil)

+	s.d.Restart(c)

 	// test1 shouldn't restart at all

 	err = waitInspectWithArgs("test1", "{{.State.Running}} {{.State.Restarting}}", "false false", 0, hostArgs...)

@@ -196,30 +183,28 @@ func (s *DockerDaemonSuite) TestDaemonRestartOnFailure(c *check.C) {

 }

 func (s *DockerDaemonSuite) TestDaemonStartIptablesFalse(c *check.C) {

-	if err := s.d.Start("--iptables=false"); err != nil {

-		c.Fatalf("we should have been able to start the daemon with passing iptables=false: %v", err)

-	}

+	s.d.Start(c, "--iptables=false")

 }

 // Make sure we cannot shrink base device at daemon restart.

 func (s *DockerDaemonSuite) TestDaemonRestartWithInvalidBasesize(c *check.C) {

 	testRequires(c, Devicemapper)

-	c.Assert(s.d.Start(), check.IsNil)

+	s.d.Start(c)

 	oldBasesizeBytes := s.d.GetBaseDeviceSize(c)

 	var newBasesizeBytes int64 = 1073741824 //1GB in bytes

 	if newBasesizeBytes < oldBasesizeBytes {

-		err := s.d.Restart("--storage-opt", fmt.Sprintf("dm.basesize=%d", newBasesizeBytes))

+		err := s.d.RestartWithError("--storage-opt", fmt.Sprintf("dm.basesize=%d", newBasesizeBytes))

 		c.Assert(err, check.IsNil, check.Commentf("daemon should not have started as new base device size is less than existing base device size: %v", err))

 	}

-	c.Assert(s.d.Stop(), check.IsNil)

+	s.d.Stop(c)

 }

 // Make sure we can grow base device at daemon restart.

 func (s *DockerDaemonSuite) TestDaemonRestartWithIncreasedBasesize(c *check.C) {

 	testRequires(c, Devicemapper)

-	c.Assert(s.d.Start(), check.IsNil)

+	s.d.Start(c)

 	oldBasesizeBytes := s.d.GetBaseDeviceSize(c)

@@ -229,14 +214,14 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithIncreasedBasesize(c *check.C) {

 		c.Skip(fmt.Sprintf("New base device size (%v) must be greater than (%s)", units.HumanSize(float64(newBasesizeBytes)), units.HumanSize(float64(oldBasesizeBytes))))

 	}

-	err := s.d.Restart("--storage-opt", fmt.Sprintf("dm.basesize=%d", newBasesizeBytes))

+	err := s.d.RestartWithError("--storage-opt", fmt.Sprintf("dm.basesize=%d", newBasesizeBytes))

 	c.Assert(err, check.IsNil, check.Commentf("we should have been able to start the daemon with increased base device size: %v", err))

 	basesizeAfterRestart := s.d.GetBaseDeviceSize(c)

 	newBasesize, err := convertBasesize(newBasesizeBytes)

 	c.Assert(err, check.IsNil, check.Commentf("Error in converting base device size: %v", err))

 	c.Assert(newBasesize, check.Equals, basesizeAfterRestart, check.Commentf("Basesize passed is not equal to Basesize set"))

-	c.Assert(s.d.Stop(), check.IsNil)

+	s.d.Stop(c)

 }

 // Issue #8444: If docker0 bridge is modified (intentionally or unintentionally) and

@@ -246,12 +231,8 @@ func (s *DockerDaemonSuite) TestDaemonStartBridgeWithoutIPAssociation(c *check.C

 	// rather than depending on brctl commands to verify docker0 is created and up

 	// let's start the daemon and stop it, and then make a modification to run the

 	// actual test

-	if err := s.d.Start(); err != nil {

-		c.Fatalf("Could not start daemon: %v", err)

-	}

-	if err := s.d.Stop(); err != nil {

-		c.Fatalf("Could not stop daemon: %v", err)

-	}

+	s.d.Start(c)

+	s.d.Stop(c)

 	// now we will remove the ip from docker0 and then try starting the daemon

 	ipCmd := exec.Command("ip", "addr", "flush", "dev", "docker0")

@@ -260,16 +241,14 @@ func (s *DockerDaemonSuite) TestDaemonStartBridgeWithoutIPAssociation(c *check.C

 		c.Fatalf("failed to remove docker0 IP association: %v, stdout: %q, stderr: %q", err, stdout, stderr)

 	}

-	if err := s.d.Start(); err != nil {

+	if err := s.d.StartWithError(); err != nil {

 		warning := "**WARNING: Docker bridge network in bad state--delete docker0 bridge interface to fix"

 		c.Fatalf("Could not start daemon when docker0 has no IP address: %v\n%s", err, warning)

 	}

 }

 func (s *DockerDaemonSuite) TestDaemonIptablesClean(c *check.C) {

-	if err := s.d.StartWithBusybox(); err != nil {

-		c.Fatalf("Could not start daemon with busybox: %v", err)

-	}

+	s.d.StartWithBusybox(c)

 	if out, err := s.d.Cmd("run", "-d", "--name", "top", "-p", "80", "busybox:latest", "top"); err != nil {

 		c.Fatalf("Could not run top: %s, %v", out, err)

@@ -287,9 +266,7 @@ func (s *DockerDaemonSuite) TestDaemonIptablesClean(c *check.C) {

 		c.Fatalf("iptables output should have contained %q, but was %q", ipTablesSearchString, out)

 	}

-	if err := s.d.Stop(); err != nil {

-		c.Fatalf("Could not stop daemon: %v", err)

-	}

+	s.d.Stop(c)

 	// get output from iptables after restart

 	ipTablesCmd = exec.Command("iptables", "-nvL")

@@ -304,9 +281,7 @@ func (s *DockerDaemonSuite) TestDaemonIptablesClean(c *check.C) {

 }

 func (s *DockerDaemonSuite) TestDaemonIptablesCreate(c *check.C) {

-	if err := s.d.StartWithBusybox(); err != nil {

-		c.Fatalf("Could not start daemon with busybox: %v", err)

-	}

+	s.d.StartWithBusybox(c)

 	if out, err := s.d.Cmd("run", "-d", "--name", "top", "--restart=always", "-p", "80", "busybox:latest", "top"); err != nil {

 		c.Fatalf("Could not run top: %s, %v", out, err)

@@ -324,9 +299,7 @@ func (s *DockerDaemonSuite) TestDaemonIptablesCreate(c *check.C) {

 		c.Fatalf("iptables output should have contained %q, but was %q", ipTablesSearchString, out)

 	}

-	if err := s.d.Restart(); err != nil {

-		c.Fatalf("Could not restart daemon: %v", err)

-	}

+	s.d.Restart(c)

 	// make sure the container is not running

 	runningOut, err := s.d.Cmd("inspect", "--format={{.State.Running}}", "top")

@@ -357,9 +330,7 @@ func (s *DockerDaemonSuite) TestDaemonIPv6Enabled(c *check.C) {

 	setupV6(c)

 	defer teardownV6(c)

-	if err := s.d.StartWithBusybox("--ipv6"); err != nil {

-		c.Fatal(err)

-	}

+	s.d.StartWithBusybox(c, "--ipv6")

 	iface, err := net.InterfaceByName("docker0")

 	if err != nil {

@@ -420,8 +391,7 @@ func (s *DockerDaemonSuite) TestDaemonIPv6FixedCIDR(c *check.C) {

 	setupV6(c)

 	defer teardownV6(c)

-	err := s.d.StartWithBusybox("--ipv6", "--fixed-cidr-v6=2001:db8:2::/64", "--default-gateway-v6=2001:db8:2::100")

-	c.Assert(err, checker.IsNil, check.Commentf("Could not start daemon with busybox: %v", err))

+	s.d.StartWithBusybox(c, "--ipv6", "--fixed-cidr-v6=2001:db8:2::/64", "--default-gateway-v6=2001:db8:2::100")

 	out, err := s.d.Cmd("run", "-itd", "--name=ipv6test", "busybox:latest")

 	c.Assert(err, checker.IsNil, check.Commentf("Could not run container: %s, %v", out, err))

@@ -448,8 +418,7 @@ func (s *DockerDaemonSuite) TestDaemonIPv6FixedCIDRAndMac(c *check.C) {

 	setupV6(c)

 	defer teardownV6(c)

-	err := s.d.StartWithBusybox("--ipv6", "--fixed-cidr-v6=2001:db8:1::/64")

-	c.Assert(err, checker.IsNil)

+	s.d.StartWithBusybox(c, "--ipv6", "--fixed-cidr-v6=2001:db8:1::/64")