github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32276 from YuPengZTE/devERR

Browse Source 
Automatic merge from submit-queue

In error, the first letter is low-case letter
This commit is contained in:
Kubernetes Submit Queue 2016-09-20 17:09:25 -07:00 committed by GitHub
commit 95dd65c9e3
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/hyperkube/hyperkube.go
View File

@ -149,7 +149,7 @@ func (hk *HyperKube) Run(args []string) error {
baseCommand = baseCommand + " " + serverName
args = args[1:]
} else {
err = errors.New("No server specified")
err = errors.New("no server specified")
hk.Printf("Error: %v\n\n", err)
hk.Usage()
return err

6
cmd/hyperkube/hyperkube_test.go
View File

@ -50,7 +50,7 @@ func testServerError(n string) *Server {
Long: fmt.Sprintf("A simple server named %s that returns an error", n),
Run: func(s *Server, args []string) error {
s.hk.Printf("%s Run\n", s.Name())
return errors.New("Server returning error")
return errors.New("server returning error")
},
}
}
@ -142,7 +142,7 @@ func TestLinkRun(t *testing.T) {
func TestTopNoArgs(t *testing.T) {
x := runFull(t, "hyperkube")
assert.EqualError(t, x.err, "No server specified")
assert.EqualError(t, x.err, "no server specified")
}
func TestBadServer(t *testing.T) {
@ -192,7 +192,7 @@ func TestServerFlagsBad(t *testing.T) {
func TestServerError(t *testing.T) {
x := runFull(t, "hyperkube test-error")
assert.Contains(t, x.output, "test-error Run")
assert.EqualError(t, x.err, "Server returning error")
assert.EqualError(t, x.err, "server returning error")
}
func TestCobraCommandHelp(t *testing.T) {

2
contrib/mesos/cmd/km/hyperkube.go
View File

@ -138,7 +138,7 @@ func (hk *HyperKube) Run(args []string) error {
baseCommand = baseCommand + " " + serverName
args = args[1:]
} else {
err = errors.New("No server specified")
err = errors.New("no server specified")
hk.Printf("Error: %v\n\n", err)
hk.Usage()
return err

6
contrib/mesos/cmd/km/hyperkube_test.go
View File

@ -48,7 +48,7 @@ func testServerError(n string) *Server {
Long: fmt.Sprintf("A simple server named %s that returns an error", n),
Run: func(s *Server, args []string) error {
s.hk.Printf("%s Run\n", s.Name())
return errors.New("Server returning error")
return errors.New("server returning error")
},
}
}
@ -90,7 +90,7 @@ func TestLinkRun(t *testing.T) {
func TestTopNoArgs(t *testing.T) {
x := runFull(t, "hyperkube")
assert.EqualError(t, x.err, "No server specified")
assert.EqualError(t, x.err, "no server specified")
}
func TestBadServer(t *testing.T) {
@ -140,5 +140,5 @@ func TestServerFlagsBad(t *testing.T) {
func TestServerError(t *testing.T) {
x := runFull(t, "hyperkube test-error")
assert.Contains(t, x.output, "test-error Run")
assert.EqualError(t, x.err, "Server returning error")
assert.EqualError(t, x.err, "server returning error")
}