@@ -1140,7 +1140,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkHostModeUngracefulDaemonRestart(c

 	// Kill daemon ungracefully and restart

 	assert.NilError(c, s.d.Kill())

-	s.d.Restart(c)

+	s.d.Start(c)

 	// make sure all the containers are up and running

 	for i := 0; i < 10; i++ {

@@ -155,7 +155,7 @@ func NewDaemon(workingDir string, ops ...Option) (*Daemon, error) {

 	if d.resolvConfContent != "" {

 		path := filepath.Join(d.Folder, "resolv.conf")

-		if err := os.WriteFile(path, []byte(d.resolvConfContent), 0644); err != nil {

+		if err := os.WriteFile(path, []byte(d.resolvConfContent), 0o644); err != nil {

 			return nil, fmt.Errorf("failed to write docker resolv.conf to %q: %v", path, err)

 		}

 		d.extraEnv = append(d.extraEnv, "DOCKER_TEST_RESOLV_CONF_PATH="+path)

@@ -692,12 +692,8 @@ func (d *Daemon) DumpStackAndQuit() {

 func (d *Daemon) Stop(t testing.TB) {

 	t.Helper()

 	err := d.StopWithError()

-	if err != nil {

-		if !errors.Is(err, errDaemonNotStarted) {

-			t.Fatalf("[%s] error while stopping the daemon: %v", d.id, err)

-		} else {

-			t.Logf("[%s] daemon is not started", d.id)

-		}

+	if err != nil && !errors.Is(err, errDaemonNotStarted) {

+		t.Fatalf("[%s] error while stopping the daemon: %v", d.id, err)

 	}

 }

@@ -732,7 +728,7 @@ func (d *Daemon) StopWithError() (retErr error) {

 	d.log.Logf("[%s] stopping daemon", d.id)

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

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

+		if errors.Is(err, os.ErrProcessDone) {

 			return errDaemonNotStarted

 		}

 		return errors.Wrapf(err, "[%s] could not send signal", d.id)