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

Move util testing package into e2e/util

Browse Source 
Signed-off-by: James Munnelly <james@munnelly.eu>
This commit is contained in:
James Munnelly 2019-01-07 20:41:42 +00:00
parent 0237d5a4c2
commit 60e6755f3f
20 changed files with 60 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/BUILD.bazel
View File

@ -54,6 +54,7 @@ filegroup(
":package-srcs",
"//test/e2e/framework:all-srcs",
"//test/e2e/suite:all-srcs",
"//test/e2e/util:all-srcs",
],
tags = ["automanaged"],
visibility = ["//visibility:public"],

2
test/e2e/suite/issuers/acme/BUILD.bazel
View File

@ -16,7 +16,7 @@ go_library(
"//test/e2e/framework/addon/pebble:go_default_library",
"//test/e2e/framework/addon/tiller:go_default_library",
"//test/e2e/suite/issuers/acme/certificate:go_default_library",
"//test/util:go_default_library",
"//test/e2e/util:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

2
test/e2e/suite/issuers/acme/certificate/BUILD.bazel
View File

@ -17,7 +17,7 @@ go_library(
"//test/e2e/framework/addon/pebble:go_default_library",
"//test/e2e/framework/addon/tiller:go_default_library",
"//test/e2e/suite/issuers/acme/dnsproviders:go_default_library",
"//test/util:go_default_library",
"//test/e2e/util:go_default_library",
"//test/util/generate:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library",

2
test/e2e/suite/issuers/acme/certificate/dns01.go
View File

@ -29,7 +29,7 @@ import (
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
"github.com/jetstack/cert-manager/test/e2e/suite/issuers/acme/dnsproviders"
"github.com/jetstack/cert-manager/test/util"
"github.com/jetstack/cert-manager/test/e2e/util"
)
type dns01Provider interface {

2
test/e2e/suite/issuers/acme/certificate/http01.go
View File

@ -30,7 +30,7 @@ import (
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
"github.com/jetstack/cert-manager/test/e2e/framework/addon/pebble"
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
"github.com/jetstack/cert-manager/test/util"
"github.com/jetstack/cert-manager/test/e2e/util"
)
const invalidACMEURL = "http://not-a-real-acme-url.com"

2
test/e2e/suite/issuers/acme/issuer.go
View File

@ -28,7 +28,7 @@ import (
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
"github.com/jetstack/cert-manager/test/e2e/framework/addon/pebble"
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
"github.com/jetstack/cert-manager/test/util"
"github.com/jetstack/cert-manager/test/e2e/util"
)
const invalidACMEURL = "http://not-a-real-acme-url.com"

2
test/e2e/suite/issuers/ca/BUILD.bazel
View File

@ -15,7 +15,7 @@ go_library(
"//pkg/util:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/addon:go_default_library",
"//test/util:go_default_library",
"//test/e2e/util:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

2
test/e2e/suite/issuers/ca/certificate.go
View File

@ -24,7 +24,7 @@ import (
"github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/util"
"github.com/jetstack/cert-manager/test/e2e/util"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

2
test/e2e/suite/issuers/ca/clusterissuer.go
View File

@ -24,7 +24,7 @@ import (
cmutil "github.com/jetstack/cert-manager/pkg/util"
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
"github.com/jetstack/cert-manager/test/util"
"github.com/jetstack/cert-manager/test/e2e/util"
)
var _ = framework.CertManagerDescribe("CA ClusterIssuer", func() {

2
test/e2e/suite/issuers/ca/issuer.go
View File

@ -22,7 +22,7 @@ import (
"github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/util"
"github.com/jetstack/cert-manager/test/e2e/util"
)
var _ = framework.CertManagerDescribe("CA Issuer", func() {

2
test/e2e/suite/issuers/selfsigned/BUILD.bazel
View File

@ -9,7 +9,7 @@ go_library(
deps = [
"//pkg/apis/certmanager/v1alpha1:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/util:go_default_library",
"//test/e2e/util:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

2
test/e2e/suite/issuers/selfsigned/certificate.go
View File

@ -25,7 +25,7 @@ import (
"github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/util"
"github.com/jetstack/cert-manager/test/e2e/util"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

2
test/e2e/suite/issuers/vault/BUILD.bazel
View File

@ -15,7 +15,7 @@ go_library(
"//test/e2e/framework/addon/tiller:go_default_library",
"//test/e2e/framework/addon/vault:go_default_library",
"//test/e2e/suite/issuers/vault/certificate:go_default_library",
"//test/util:go_default_library",
"//test/e2e/util:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library",
],

2
test/e2e/suite/issuers/vault/certificate/BUILD.bazel
View File

@ -14,7 +14,7 @@ go_library(
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/addon/tiller:go_default_library",
"//test/e2e/framework/addon/vault:go_default_library",
"//test/util:go_default_library",
"//test/e2e/util:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

2
test/e2e/suite/issuers/vault/certificate/approle.go
View File

@ -27,7 +27,7 @@ import (
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
vaultaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/vault"
"github.com/jetstack/cert-manager/test/util"
"github.com/jetstack/cert-manager/test/e2e/util"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

2
test/e2e/suite/issuers/vault/certificate/approle_custom_mount.go
View File

@ -27,7 +27,7 @@ import (
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
vaultaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/vault"
"github.com/jetstack/cert-manager/test/util"
"github.com/jetstack/cert-manager/test/e2e/util"
)
var _ = framework.CertManagerDescribe("Vault Certificate (AppRole with a custom mount path)", func() {

2
test/e2e/suite/issuers/vault/issuer.go
View File

@ -27,7 +27,7 @@ import (
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
vaultaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/vault"
"github.com/jetstack/cert-manager/test/util"
"github.com/jetstack/cert-manager/test/e2e/util"
)
var _ = framework.CertManagerDescribe("Vault Issuer", func() {

39
test/e2e/util/BUILD.bazel Normal file
View File

@ -0,0 +1,39 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["util.go"],
importpath = "github.com/jetstack/cert-manager/test/e2e/util",
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/certmanager/v1alpha1:go_default_library",
"//pkg/client/clientset/versioned/scheme:go_default_library",
"//pkg/client/clientset/versioned/typed/certmanager/v1alpha1:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/pki:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

8
test/util/util.go → test/e2e/util/util.go
View File

@ -52,7 +52,7 @@ func CertificateOnlyValidForDomains(cert *x509.Certificate, commonName string, d
}
func WaitForIssuerStatusFunc(client clientset.IssuerInterface, name string, fn func(*v1alpha1.Issuer) (bool, error)) error {
return wait.PollImmediate(500*time.Millisecond, wait.ForeverTestTimeout,
return wait.PollImmediate(500*time.Millisecond, time.Minute,
func() (bool, error) {
issuer, err := client.Get(name, metav1.GetOptions{})
if err != nil {
@ -65,7 +65,7 @@ func WaitForIssuerStatusFunc(client clientset.IssuerInterface, name string, fn f
// WaitForIssuerCondition waits for the status of the named issuer to contain
// a condition whose type and status matches the supplied one.
func WaitForIssuerCondition(client clientset.IssuerInterface, name string, condition v1alpha1.IssuerCondition) error {
pollErr := wait.PollImmediate(500*time.Millisecond, wait.ForeverTestTimeout,
pollErr := wait.PollImmediate(500*time.Millisecond, time.Minute,
func() (bool, error) {
glog.V(5).Infof("Waiting for issuer %v condition %#v", name, condition)
issuer, err := client.Get(name, metav1.GetOptions{})
@ -103,7 +103,7 @@ func wrapErrorWithIssuerStatusCondition(client clientset.IssuerInterface, pollEr
// WaitForClusterIssuerCondition waits for the status of the named issuer to contain
// a condition whose type and status matches the supplied one.
func WaitForClusterIssuerCondition(client clientset.ClusterIssuerInterface, name string, condition v1alpha1.IssuerCondition) error {
pollErr := wait.PollImmediate(500*time.Millisecond, wait.ForeverTestTimeout,
pollErr := wait.PollImmediate(500*time.Millisecond, time.Minute,
func() (bool, error) {
glog.V(5).Infof("Waiting for clusterissuer %v condition %#v", name, condition)
issuer, err := client.Get(name, metav1.GetOptions{})
@ -327,7 +327,7 @@ func WaitForCertificateToExist(client clientset.CertificateInterface, name strin
// WaitForCRDToNotExist waits for the CRD with the given name to no
// longer exist.
func WaitForCRDToNotExist(client apiextcs.CustomResourceDefinitionInterface, name string) error {
return wait.PollImmediate(500*time.Millisecond, wait.ForeverTestTimeout,
return wait.PollImmediate(500*time.Millisecond, time.Minute,
func() (bool, error) {
glog.V(5).Infof("Waiting for CRD %v to not exist", name)
_, err := client.Get(name, metav1.GetOptions{})

26
test/util/BUILD.bazel
View File

@ -1,29 +1,3 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["util.go"],
importpath = "github.com/jetstack/cert-manager/test/util",
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/certmanager/v1alpha1:go_default_library",
"//pkg/client/clientset/versioned/scheme:go_default_library",
"//pkg/client/clientset/versioned/typed/certmanager/v1alpha1:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/pki:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),