Skip to content

Commit 5078428

Browse files
authored
Merge pull request #19390 from k8s-infra-cherrypick-robot/cherry-pick-19367-to-release-3.6
[release-3.6] Fix a log formatting bug in the e2e downgrade tests
2 parents bf1f998 + abbf79f commit 5078428

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

tests/e2e/cluster_downgrade_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"github.com/coreos/go-semver/semver"
2525
"github.com/stretchr/testify/assert"
2626
"github.com/stretchr/testify/require"
27-
"go.uber.org/zap"
2827

2928
"go.etcd.io/etcd/api/v3/version"
3029
"go.etcd.io/etcd/client/pkg/v3/fileutil"
@@ -160,7 +159,7 @@ func testDowngradeUpgrade(t *testing.T, numberOfMembersToDowngrade int, clusterS
160159
}
161160

162161
membersToChange := rand.Perm(len(epc.Procs))[:numberOfMembersToDowngrade]
163-
t.Logf(fmt.Sprintln("Elect members for operations"), zap.Any("members", membersToChange))
162+
t.Logf("Elect members for operations on members: %v", membersToChange)
164163

165164
t.Logf("Starting downgrade process to %q", lastVersionStr)
166165
err = e2e.DowngradeUpgradeMembersByID(t, nil, epc, membersToChange, currentVersion, lastClusterVersion)

tests/framework/e2e/downgrade.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func DowngradeCancel(t *testing.T, epc *EtcdProcessCluster) {
8484

8585
func DowngradeUpgradeMembers(t *testing.T, lg *zap.Logger, clus *EtcdProcessCluster, numberOfMembersToChange int, currentVersion, targetVersion *semver.Version) error {
8686
membersToChange := rand.Perm(len(clus.Procs))[:numberOfMembersToChange]
87-
t.Logf(fmt.Sprintln("Elect members for operations"), zap.Any("members", membersToChange))
87+
t.Logf("Elect members for operations on members: %v", membersToChange)
8888

8989
return DowngradeUpgradeMembersByID(t, lg, clus, membersToChange, currentVersion, targetVersion)
9090
}

0 commit comments

Comments
 (0)