summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2019-01-21 13:16:02 +0100
committerSebastiaan van Stijn <github@gone.nl>2019-01-21 13:16:02 +0100
commit3449b12cc7eefa8ebd0de6ec8b9803c6ee823af0 (patch)
treee10a731816eb65a9b34f09b79a2afca797988c52 /plugin
parent5ec31380a5d3ea92fc68e53cd1fc96f11ac02e6e (diff)
downloaddocker-3449b12cc7eefa8ebd0de6ec8b9803c6ee823af0.tar.gz
Use assert.NilError() instead of assert.Assert()
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'plugin')
-rw-r--r--plugin/executor/containerd/containerd_test.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugin/executor/containerd/containerd_test.go b/plugin/executor/containerd/containerd_test.go
index e27063b1d8..3fb45981f3 100644
--- a/plugin/executor/containerd/containerd_test.go
+++ b/plugin/executor/containerd/containerd_test.go
@@ -28,7 +28,7 @@ func TestLifeCycle(t *testing.T) {
mock.simulateStartError(false, id)
err = exec.Create(id, specs.Spec{}, nil, nil)
- assert.Assert(t, err)
+ assert.NilError(t, err)
running, _ := exec.IsRunning(id)
assert.Assert(t, running)
@@ -39,12 +39,12 @@ func TestLifeCycle(t *testing.T) {
mock.HandleExitEvent(id) // simulate a plugin that exits
err = exec.Create(id, specs.Spec{}, nil, nil)
- assert.Assert(t, err)
+ assert.NilError(t, err)
}
func setupTest(t *testing.T, client Client, eh ExitHandler) (*Executor, func()) {
rootDir, err := ioutil.TempDir("", "test-daemon")
- assert.Assert(t, err)
+ assert.NilError(t, err)
assert.Assert(t, client != nil)
assert.Assert(t, eh != nil)