weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

test/integration/webhook: Use context

Browse Source 
Signed-off-by: James Munnelly <james@munnelly.eu>
This commit is contained in:
James Munnelly 2020-03-30 17:24:02 +01:00
parent 0712d008d9
commit af9875e210
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration/webhook/dynamic_authority_test.go
View File

@ -18,6 +18,7 @@ package webhook
import (
"bytes"
"context"
"crypto/tls"
"crypto/x509"
"fmt"
@ -97,7 +98,7 @@ func TestDynamicAuthority_Recreates(t *testing.T) {
}
t.Logf("Secret resource has been provisioned, deleting to ensure it is recreated")
if err := cl.CoreV1().Secrets(auth.SecretNamespace).Delete(auth.SecretName, &metav1.DeleteOptions{}); err != nil {
if err := cl.CoreV1().Secrets(auth.SecretNamespace).Delete(context.TODO(), auth.SecretName, metav1.DeleteOptions{}); err != nil {
t.Fatal(err)
}
@ -114,7 +115,7 @@ func TestDynamicAuthority_Recreates(t *testing.T) {
// This can be used with the `k8s.io/apimachinery/pkg/util/wait` package.
func authoritySecretReadyConditionFunc(t *testing.T, cl kubernetes.Interface, namespace, name string) wait.ConditionFunc {
return func() (done bool, err error) {
s, err := cl.CoreV1().Secrets(namespace).Get(name, metav1.GetOptions{})
s, err := cl.CoreV1().Secrets(namespace).Get(context.TODO(), name, metav1.GetOptions{})
if apierrors.IsNotFound(err) {
t.Logf("Secret resource %s/%s does not yet exist, waiting...", namespace, name)
return false, nil

3
test/integration/webhook/dynamic_source_test.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package webhook
import (
"context"
"crypto/x509"
"math/big"
"testing"
@ -134,7 +135,7 @@ func TestDynamicSource_CARotation(t *testing.T) {
}
cl := kubernetes.NewForConfigOrDie(config)
if err := cl.CoreV1().Secrets(source.Authority.SecretNamespace).Delete(source.Authority.SecretName, &metav1.DeleteOptions{}); err != nil {
if err := cl.CoreV1().Secrets(source.Authority.SecretNamespace).Delete(context.TODO(), source.Authority.SecretName, metav1.DeleteOptions{}); err != nil {
t.Fatalf("Failed to delete CA secret: %v", err)
}