kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #34842 from dnephin/fix-integration-on-timeout

Browse source 
[integration-cli] Only attempt to find pid with local daemon
This commit is contained in:
Yong Tang 2017-09-16 06:48:18 -07:00 committed by GitHub
commit c5c0702a4d
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
integration-cli/check_test.go
View file

@ -79,6 +79,9 @@ type DockerSuite struct {
}
func (s *DockerSuite) OnTimeout(c *check.C) {
if !testEnv.IsLocalDaemon() {
return
}
path := filepath.Join(os.Getenv("DEST"), "docker.pid")
b, err := ioutil.ReadFile(path)
if err != nil {
@ -91,7 +94,7 @@ func (s *DockerSuite) OnTimeout(c *check.C) {
}
daemonPid := int(rawPid)
if daemonPid > 0 && testEnv.IsLocalDaemon() {
if daemonPid > 0 {
daemon.SignalDaemonDump(daemonPid)
}
}