kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Optimize the unit test for restartmanager 

Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
This commit is contained in:
yuexiao-wang 2016-11-24 22:10:49 +08:00
parent e47ca825d1
commit 0a0bbab81d
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 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 { func New(policy container.RestartPolicy, restartCount int) RestartManager {
return &restartManager{policy: policy, restartCount: restartCount, cancel: make(chan struct{})} return &restartManager{policy: policy, restartCount: restartCount, cancel: make(chan struct{})}
} }
@ -63,7 +63,7 @@ func (rm *restartManager) ShouldRestart(exitCode uint32, hasBeenManuallyStopped
} }
if rm.active { 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 // if the container ran for more than 10s, regardless of status and policy reset the
// the timeout back to the default. // the timeout back to the default.

14
restartmanager/restartmanager_test.go
View File

@ -9,26 +9,28 @@ import (
func TestRestartManagerTimeout(t *testing.T) { func TestRestartManagerTimeout(t *testing.T) {
rm := New(container.RestartPolicy{Name: "always"}, 0).(*restartManager) 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 { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if !should { if !should {
t.Fatal("container should be restarted") t.Fatal("container should be restarted")
} }
if rm.timeout != 100*time.Millisecond { if rm.timeout != defaultTimeout {
t.Fatalf("restart manager should have a timeout of 100ms but has %s", rm.timeout) t.Fatalf("restart manager should have a timeout of 100 ms but has %s", rm.timeout)
} }
} }
func TestRestartManagerTimeoutReset(t *testing.T) { func TestRestartManagerTimeoutReset(t *testing.T) {
rm := New(container.RestartPolicy{Name: "always"}, 0).(*restartManager) rm := New(container.RestartPolicy{Name: "always"}, 0).(*restartManager)
rm.timeout = 5 * time.Second 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 { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if rm.timeout != 100*time.Millisecond { if rm.timeout != defaultTimeout {
t.Fatalf("restart manager should have a timeout of 100ms but has %s", rm.timeout) t.Fatalf("restart manager should have a timeout of 100 ms but has %s", rm.timeout)
} }
} }