summaryrefslogtreecommitdiff
path: root/client/network_inspect_test.go
diff options
context:
space:
mode:
authorDaniel Nephin <dnephin@docker.com>2017-09-08 12:04:34 -0400
committerDaniel Nephin <dnephin@docker.com>2017-09-11 19:53:18 -0400
commit81bb9978ab5ac99e84a5bf62d0d469f0aec1d506 (patch)
tree49e3c30543c4da0e54f0e765f302e22ccb3afcc6 /client/network_inspect_test.go
parent63a9ea58eb4c704ed7d7dab950f12f708cf220f7 (diff)
downloaddocker-81bb9978ab5ac99e84a5bf62d0d469f0aec1d506.tar.gz
Cleanup client not found errors.
And fix remove calls to return a notFound error Signed-off-by: Daniel Nephin <dnephin@docker.com>
Diffstat (limited to 'client/network_inspect_test.go')
-rw-r--r--client/network_inspect_test.go13
1 files changed, 5 insertions, 8 deletions
diff --git a/client/network_inspect_test.go b/client/network_inspect_test.go
index 9bfb55d74e..56399c7bc2 100644
--- a/client/network_inspect_test.go
+++ b/client/network_inspect_test.go
@@ -21,20 +21,17 @@ func TestNetworkInspectError(t *testing.T) {
}
_, err := client.NetworkInspect(context.Background(), "nothing", types.NetworkInspectOptions{})
- if err == nil || err.Error() != "Error response from daemon: Server error" {
- t.Fatalf("expected a Server Error, got %v", err)
- }
+ assert.EqualError(t, err, "Error response from daemon: Server error")
}
-func TestNetworkInspectContainerNotFound(t *testing.T) {
+func TestNetworkInspectNotFoundError(t *testing.T) {
client := &Client{
- client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
+ client: newMockClient(errorMock(http.StatusNotFound, "missing")),
}
_, err := client.NetworkInspect(context.Background(), "unknown", types.NetworkInspectOptions{})
- if err == nil || !IsErrNetworkNotFound(err) {
- t.Fatalf("expected a networkNotFound error, got %v", err)
- }
+ assert.EqualError(t, err, "Error: No such network: unknown")
+ assert.True(t, IsErrNotFound(err))
}
func TestNetworkInspect(t *testing.T) {