beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #28792 from yuexiao-wang/restart-mgr

Browse source 
Optimize the unit test for restartmanager
This commit is contained in:
Vincent Demeester 2016-11-28 20:27:44 +01:00 committed by GitHub
commit 3ccc4bc370
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
restartmanager/restartmanager.go
View file

@ -35,7 +35,7 @@ type restartManager struct {
canceled bool
}
// New returns a new restartmanager based on a policy.
// New returns a new restartManager based on a policy.
func New(policy container.RestartPolicy, restartCount int) RestartManager {
return &restartManager{policy: policy, restartCount: restartCount, cancel: make(chan struct{})}
}
@ -63,7 +63,7 @@ func (rm *restartManager) ShouldRestart(exitCode uint32, hasBeenManuallyStopped
}
if rm.active {
return false, nil, fmt.Errorf("invalid call on active restartmanager")
return false, nil, fmt.Errorf("invalid call on an active restart manager")
}
// if the container ran for more than 10s, regardless of status and policy reset the
// the timeout back to the default.

14
restartmanager/restartmanager_test.go
View file

@ -9,26 +9,28 @@ import (
func TestRestartManagerTimeout(t *testing.T) {
rm := New(container.RestartPolicy{Name: "always"}, 0).(*restartManager)
should, _, err := rm.ShouldRestart(0, false, 1*time.Second)
var duration = time.Duration(1 * time.Second)
should, _, err := rm.ShouldRestart(0, false, duration)
if err != nil {
t.Fatal(err)
}
if !should {
t.Fatal("container should be restarted")
}
if rm.timeout != 100*time.Millisecond {
t.Fatalf("restart manager should have a timeout of 100ms but has %s", rm.timeout)
if rm.timeout != defaultTimeout {
t.Fatalf("restart manager should have a timeout of 100 ms but has %s", rm.timeout)
}
}
func TestRestartManagerTimeoutReset(t *testing.T) {
rm := New(container.RestartPolicy{Name: "always"}, 0).(*restartManager)
rm.timeout = 5 * time.Second
_, _, err := rm.ShouldRestart(0, false, 10*time.Second)
var duration = time.Duration(10 * time.Second)
_, _, err := rm.ShouldRestart(0, false, duration)
if err != nil {
t.Fatal(err)
}
if rm.timeout != 100*time.Millisecond {
t.Fatalf("restart manager should have a timeout of 100ms but has %s", rm.timeout)
if rm.timeout != defaultTimeout {
t.Fatalf("restart manager should have a timeout of 100 ms but has %s", rm.timeout)
}
}