Merge pull request #40132 from…

Merge pull request #40132 from bruceauyeung/k8s-branch-add-invalid-and-valid-tokens-in-TestValidateToken-testcase Automatic merge from submit-queue add test tokens for TestValidateToken Signed-off-by: bruceauyeung <ouyang.qinhua@zte.com.cn> **What this PR does / why we need it**: 1. add invalid tokens which token ID and token secret contain special characters such as `*` 2. add valid tokens which token ID and token secret contain mixed lowercase characters and numeric numbers

Merge pull request #40132 from…
433e7a1f · Kubernetes Submit Queue · GitHub · a951727a · cc198d32 · 433e7a1f
Commit 433e7a1f authored Jan 27, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

tokens_test.go cmd/kubeadm/app/util/tokens_test.go +4 -0

No files found.
--- a/cmd/kubeadm/app/util/tokens_test.go
+++ b/cmd/kubeadm/app/util/tokens_test.go
@@ -89,6 +89,8 @@ func TestValidateToken(t *testing.T) {
 		{ID: "12345", Secret: "1234567890123456"},
 		{ID: "Abcdef", Secret: "1234567890123456"},
 		{ID: "123456", Secret: "AABBCCDDEEFFGGHH"},
+		{ID: "abc*ef", Secret: "1234567890123456"},
+		{ID: "abcdef", Secret: "123456789*123456"},
 	}

 	for _, token := range invalidTokens {
@@ -100,6 +102,8 @@ func TestValidateToken(t *testing.T) {
 	validTokens := []*kubeadmapi.TokenDiscovery{
 		{ID: "abcdef", Secret: "1234567890123456"},
 		{ID: "123456", Secret: "aabbccddeeffgghh"},
+		{ID: "abc456", Secret: "1234567890123456"},
+		{ID: "abcdef", Secret: "123456ddeeffgghh"},
 	}

 	for _, token := range validTokens {