github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix golint issues in test/e2e/lifecycle/

Browse Source
This commit is contained in:
tanjunchen
2019-12-03 17:14:38 +08:00
parent cf16e4988f
commit d2d68026fc
5 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/lifecycle/bootstrap/bootstrap_token_cleaner.go
View File

@@ -49,36 +49,36 @@ var _ = lifecycle.SIGDescribe("[Feature:BootstrapTokens]", func() {
})
ginkgo.It("should delete the token secret when the secret expired", func() {
ginkgo.By("create a new expired bootstrap token secret")
tokenId, err := GenerateTokenId()
tokenID, err := GenerateTokenID()
framework.ExpectNoError(err)
tokenSecret, err := GenerateTokenSecret()
framework.ExpectNoError(err)
secret := newTokenSecret(tokenId, tokenSecret)
secret := newTokenSecret(tokenID, tokenSecret)
addSecretExpiration(secret, TimeStringFromNow(-time.Hour))
_, err = c.CoreV1().Secrets(metav1.NamespaceSystem).Create(secret)
framework.ExpectNoError(err)
ginkgo.By("wait for the bootstrap token secret be deleted")
err = WaitForBootstrapTokenSecretToDisappear(c, tokenId)
err = WaitForBootstrapTokenSecretToDisappear(c, tokenID)
framework.ExpectNoError(err)
})
ginkgo.It("should not delete the token secret when the secret is not expired", func() {
ginkgo.By("create a new expired bootstrap token secret")
tokenId, err := GenerateTokenId()
tokenID, err := GenerateTokenID()
framework.ExpectNoError(err)
tokenSecret, err := GenerateTokenSecret()
framework.ExpectNoError(err)
secret := newTokenSecret(tokenId, tokenSecret)
secret := newTokenSecret(tokenID, tokenSecret)
addSecretExpiration(secret, TimeStringFromNow(time.Hour))
_, err = c.CoreV1().Secrets(metav1.NamespaceSystem).Create(secret)
secretNeedClean = bootstrapapi.BootstrapTokenSecretPrefix + tokenId
secretNeedClean = bootstrapapi.BootstrapTokenSecretPrefix + tokenID
framework.ExpectNoError(err)
ginkgo.By("wait for the bootstrap token secret not be deleted")
err = WaitForBootstrapTokenSecretNotDisappear(c, tokenId, 20*time.Second)
err = WaitForBootstrapTokenSecretNotDisappear(c, tokenID, 20*time.Second)
framework.ExpectNoError(err)
})
})