github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100362 from CaoDonghui123/fixissues6

Browse Source 
Fix a panic in "e2e.test --help"
This commit is contained in:
Kubernetes Prow Robot 2021-03-23 14:24:07 -07:00 committed by GitHub
commit e471fa419e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/component-base/cli/flag/string_slice_flag.go
View File

@ -38,12 +38,16 @@ var _ goflag.Value = &StringSlice{}
var _ pflag.Value = &StringSlice{}
func (s *StringSlice) String() string {
if s == nil || s.value == nil {
return ""
}
return strings.Join(*s.value, " ")
}
func (s *StringSlice) Set(val string) error {
if s.value == nil || !s.changed {
*s.value = make([]string, 0)
v := make([]string, 0)
s.value = &v
}
*s.value = append(*s.value, val)
s.changed = true

4
staging/src/k8s.io/component-base/cli/flag/string_slice_flag_test.go
View File

@ -83,8 +83,8 @@ func TestStringSlice(t *testing.T) {
} else if err != nil {
t.Errorf("%d: expected nil error, got %v", i, err)
}
if !reflect.DeepEqual(s, test.expected) {
t.Errorf("%d: expected %+v, got %+v", i, test.expected, s)
if !reflect.DeepEqual(*v.value, test.expected) {
t.Errorf("%d: expected %+v, got %+v", i, test.expected, *v.value)
}
if v.changed != test.changed {
t.Errorf("%d: expected %t got %t", i, test.changed, v.changed)