From ba80421254ab7682f2e0ae41b7b5b634a3a8cb5d Mon Sep 17 00:00:00 2001 From: ZhangYu Date: Sat, 16 Jul 2022 09:23:48 +0800 Subject: [PATCH 1/2] Add testcases for cmd/kubeadm/app/util/net.go and version.go --- cmd/kubeadm/app/util/net_test.go | 6 ++++++ cmd/kubeadm/app/util/version_test.go | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/cmd/kubeadm/app/util/net_test.go b/cmd/kubeadm/app/util/net_test.go index 8d5888349a2..6daf8048f26 100644 --- a/cmd/kubeadm/app/util/net_test.go +++ b/cmd/kubeadm/app/util/net_test.go @@ -44,6 +44,12 @@ func TestGetHostname(t *testing.T) { result: "overridden", expectedErr: nil, }, + { + desc: "hostname contains spaces", + hostname: " OVERRIDDEN ", + result: "overridden", + expectedErr: nil, + }, { desc: "hostname contains only spaces", hostname: " ", diff --git a/cmd/kubeadm/app/util/version_test.go b/cmd/kubeadm/app/util/version_test.go index c392a6a2e5d..abb690b1947 100644 --- a/cmd/kubeadm/app/util/version_test.go +++ b/cmd/kubeadm/app/util/version_test.go @@ -381,6 +381,11 @@ func TestKubeadmVersion(t *testing.T) { input: "v1.9", parsingError: true, }, + { + name: "invalid version with label and stray dot", + input: "v1.8.0-alpha.2.", + parsingError: true, + }, { name: "invalid version with label and metadata", input: "v1.8.0-alpha.2.1231+afabd012389d53a", From db0bfd8727e3164cb9ec67a922bcfbe83aeecf5f Mon Sep 17 00:00:00 2001 From: Octopusjust <57062457+Octopusjust@users.noreply.github.com> Date: Mon, 18 Jul 2022 14:15:06 +0800 Subject: [PATCH 2/2] Update version_test.go run ./hack/verify-gofmt.sh --- cmd/kubeadm/app/util/version_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/util/version_test.go b/cmd/kubeadm/app/util/version_test.go index abb690b1947..f7dadaea8a7 100644 --- a/cmd/kubeadm/app/util/version_test.go +++ b/cmd/kubeadm/app/util/version_test.go @@ -382,8 +382,8 @@ func TestKubeadmVersion(t *testing.T) { parsingError: true, }, { - name: "invalid version with label and stray dot", - input: "v1.8.0-alpha.2.", + name: "invalid version with label and stray dot", + input: "v1.8.0-alpha.2.", parsingError: true, }, {