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

Merge pull request #6585 from kzys/runconfig-fatalf 

Fatal() doesn't take a format string like Fatalf()
This commit is contained in:
Victor Vieux 2014-06-23 10:24:01 -07:00
parent 549e34b3d7 00469957ad
commit c32036fa9b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runconfig/parse_test.go
View File

@ -25,26 +25,26 @@ func TestParseLxcConfOpt(t *testing.T) {
func TestNetHostname(t *testing.T) {
if _, _, _, err := Parse([]string{"-h=name", "img", "cmd"}, nil); err != nil {
t.Fatal("Unexpected error: %s", err)
t.Fatalf("Unexpected error: %s", err)
}
if _, _, _, err := Parse([]string{"--net=host", "img", "cmd"}, nil); err != nil {
t.Fatal("Unexpected error: %s", err)
t.Fatalf("Unexpected error: %s", err)
}
if _, _, _, err := Parse([]string{"-h=name", "--net=bridge", "img", "cmd"}, nil); err != nil {
t.Fatal("Unexpected error: %s", err)
t.Fatalf("Unexpected error: %s", err)
}
if _, _, _, err := Parse([]string{"-h=name", "--net=none", "img", "cmd"}, nil); err != nil {
t.Fatal("Unexpected error: %s", err)
t.Fatalf("Unexpected error: %s", err)
}
if _, _, _, err := Parse([]string{"-h=name", "--net=host", "img", "cmd"}, nil); err != ErrConflictNetworkHostname {
t.Fatal("Expected error ErrConflictNetworkHostname, got: %s", err)
t.Fatalf("Expected error ErrConflictNetworkHostname, got: %s", err)
}
if _, _, _, err := Parse([]string{"-h=name", "--net=container:other", "img", "cmd"}, nil); err != ErrConflictNetworkHostname {
t.Fatal("Expected error ErrConflictNetworkHostname, got: %s", err)
t.Fatalf("Expected error ErrConflictNetworkHostname, got: %s", err)
}
}