Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix unit test breakage in release-3.10 #20206

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkg/apps/strategy/recreate/recreate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ func TestRecreate_deploymentPreHookFail(t *testing.T) {
}

if len(controllerClient.scaleEvents) > 0 {
t.Fatalf("unexpected scaling events: %d", controllerClient.scaleEvents)
t.Fatalf("unexpected scaling events: %v", controllerClient.scaleEvents)
}
}

Expand Down Expand Up @@ -253,7 +253,7 @@ func TestRecreate_deploymentMidHookSuccess(t *testing.T) {
}

if len(controllerClient.scaleEvents) > 0 {
t.Fatalf("unexpected scaling events: %d", controllerClient.scaleEvents)
t.Fatalf("unexpected scaling events: %v", controllerClient.scaleEvents)
}
}

Expand Down Expand Up @@ -405,10 +405,10 @@ func TestRecreate_acceptorSuccessWithColdCaches(t *testing.T) {
if len(controllerClient.scaleEvents) != 2 {
t.Fatalf("expected 2 scale calls, got %d", len(controllerClient.scaleEvents))
}
if r := controllerClient.scaleEvents[0]; r.Spec.Replicas != 1 {
if r := controllerClient.scaleEvents[0].Spec.Replicas; r != 1 {
t.Errorf("expected first scale event to be 1 replica, got %d", r)
}
if r := controllerClient.scaleEvents[1]; r.Spec.Replicas != 2 {
if r := controllerClient.scaleEvents[1].Spec.Replicas; r != 2 {
t.Errorf("expected second scale event to be 2 replica, got %d", r)
}
}
Expand Down Expand Up @@ -445,6 +445,6 @@ func TestRecreate_acceptorFail(t *testing.T) {
t.Fatalf("expected 1 scale calls, got %d", len(rcClient.scaleEvents))
}
if r := rcClient.scaleEvents[0]; r.Spec.Replicas != 1 {
t.Errorf("expected first scale event to be 1 replica, got %d", r)
t.Errorf("expected first scale event to be 1 replica, got %v", r)
}
}
2 changes: 1 addition & 1 deletion pkg/cmd/server/start/start_node.go
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ func execKubelet(kubeletArgs []string) error {
for i, s := range os.Args {
if s == "--vmodule" {
if i+1 < len(os.Args) {
args = append(args, fmt.Sprintf("--vmodule=", os.Args[i+1]))
args = append(args, fmt.Sprintf("--vmodule=%q", os.Args[i+1]))
break
}
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.