p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

internal/test/daemon: don't leak timers

Browse Source 
A timer is leaking on every daemon start and stop.
Probably nothing major, but given the amount of
daemon starts/stops during tests, it's better to
be accurate about it.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 6016520162fdcb19f50d08c4f0b54b06a7a6eac0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 784a89354b118ef68f1f20fb4ff383c6282ea03c
Component: engine
This commit is contained in:
Kir Kolyshkin
2018-10-25 01:08:45 -07:00
committed by Sebastiaan van Stijn
parent 84be354cdf
commit d81b3ef73b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/engine/internal/test/daemon/daemon.go
View File

@ -275,7 +275,10 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error {
d.Wait = wait
tick := time.Tick(500 * time.Millisecond)
ticker := time.NewTicker(500 * time.Millisecond)
defer ticker.Stop()
tick := ticker.C
// make sure daemon is ready to receive requests
startTime := time.Now().Unix()
for {
@ -413,7 +416,9 @@ func (d *Daemon) StopWithError() error {
}()
i := 1
tick := time.Tick(time.Second)
ticker := time.NewTicker(time.Second)
defer ticker.Stop()
tick := ticker.C
if err := d.cmd.Process.Signal(os.Interrupt); err != nil {
if strings.Contains(err.Error(), "os: process already finished") {