Skip to content

Commit 88bda66

Browse files
jetstack-botjetstack-bot
authored
Merge pull request cert-manager#5345 from inteon/ginkgo_v2
Upgrade to Ginkgo v2
2 parents f058c81 + a874362 commit 88bda66

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+180
-193
lines changed

‎LICENSES

+1-5
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,7 @@ github.com/modern-go/reflect2,https://github.com/modern-go/reflect2/blob/v1.0.2/
128128
github.com/monochromegane/go-gitignore,https://github.com/monochromegane/go-gitignore/blob/205db1a8cc00/LICENSE,MIT
129129
github.com/morikuni/aec,https://github.com/morikuni/aec/blob/v1.0.0/LICENSE,MIT
130130
github.com/munnerz/goautoneg,https://github.com/munnerz/goautoneg/blob/a7dc8b61c822/LICENSE,BSD-3-Clause
131-
github.com/nxadm/tail,https://github.com/nxadm/tail/blob/v1.4.8/LICENSE,MIT
132-
github.com/nxadm/tail/ratelimiter,https://github.com/nxadm/tail/blob/v1.4.8/ratelimiter/Licence,MIT
133-
github.com/onsi/ginkgo,https://github.com/onsi/ginkgo/blob/v1.16.5/LICENSE,MIT
134-
github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable,https://github.com/onsi/ginkgo/blob/v1.16.5/reporters/stenographer/support/go-colorable/LICENSE,MIT
131+
github.com/onsi/ginkgo/v2,https://github.com/onsi/ginkgo/blob/v2.1.4/LICENSE,MIT
135132
github.com/onsi/gomega,https://github.com/onsi/gomega/blob/v1.19.0/LICENSE,MIT
136133
github.com/opencontainers/go-digest,https://github.com/opencontainers/go-digest/blob/v1.0.0/LICENSE,Apache-2.0
137134
github.com/opencontainers/image-spec/specs-go,https://github.com/opencontainers/image-spec/blob/c5a74bcca799/LICENSE,Apache-2.0
@@ -201,7 +198,6 @@ gopkg.in/ini.v1,https://github.com/go-ini/ini/blob/v1.66.2/LICENSE,Apache-2.0
201198
gopkg.in/natefinch/lumberjack.v2,https://github.com/natefinch/lumberjack/blob/v2.0.0/LICENSE,MIT
202199
gopkg.in/square/go-jose.v2,https://github.com/square/go-jose/blob/v2.5.1/LICENSE,Apache-2.0
203200
gopkg.in/square/go-jose.v2/json,https://github.com/square/go-jose/blob/v2.5.1/json/LICENSE,BSD-3-Clause
204-
gopkg.in/tomb.v1,https://github.com/go-tomb/tomb/blob/dd632973f1e7/LICENSE,BSD-3-Clause
205201
gopkg.in/yaml.v2,https://github.com/go-yaml/yaml/blob/v2.4.0/LICENSE,Apache-2.0
206202
gopkg.in/yaml.v3,https://github.com/go-yaml/yaml/blob/496545a6307b/LICENSE,MIT
207203
helm.sh/helm/v3,https://github.com/helm/helm/blob/v3.9.0/LICENSE,Apache-2.0

‎go.mod

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/miekg/dns v1.1.47
2424
github.com/mitchellh/go-homedir v1.1.0
2525
github.com/munnerz/crd-schema-fuzz v1.0.0
26-
github.com/onsi/ginkgo v1.16.5
26+
github.com/onsi/ginkgo/v2 v2.1.4
2727
github.com/onsi/gomega v1.19.0
2828
github.com/pavel-v-chernykh/keystore-go/v4 v4.2.0
2929
github.com/pkg/errors v0.9.1
@@ -126,6 +126,7 @@ require (
126126
github.com/google/btree v1.0.1 // indirect
127127
github.com/google/go-cmp v0.5.6 // indirect
128128
github.com/google/go-querystring v1.0.0 // indirect
129+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
129130
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
130131
github.com/google/uuid v1.3.0 // indirect
131132
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
@@ -172,7 +173,6 @@ require (
172173
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
173174
github.com/morikuni/aec v1.0.0 // indirect
174175
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
175-
github.com/nxadm/tail v1.4.8 // indirect
176176
github.com/opencontainers/go-digest v1.0.0 // indirect
177177
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
178178
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
@@ -231,7 +231,6 @@ require (
231231
gopkg.in/ini.v1 v1.66.2 // indirect
232232
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
233233
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
234-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
235234
gopkg.in/yaml.v2 v2.4.0 // indirect
236235
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
237236
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect

‎go.sum

+3-2
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,7 @@ github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLe
680680
github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
681681
github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
682682
github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
683+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
683684
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
684685
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
685686
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
@@ -1006,8 +1007,8 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
10061007
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
10071008
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
10081009
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
1009-
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
1010-
github.com/onsi/ginkgo/v2 v2.1.3 h1:e/3Cwtogj0HA+25nMP1jCMDIf8RtRYbGwGGuBIFztkc=
1010+
github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY=
1011+
github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
10111012
github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
10121013
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
10131014
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=

‎hack/bin/tools.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ limitations under the License.
2323
package bin
2424

2525
import (
26-
_ "github.com/onsi/ginkgo/ginkgo"
26+
_ "github.com/onsi/ginkgo/v2/ginkgo"
2727
_ "k8s.io/code-generator/cmd/client-gen"
2828
_ "k8s.io/code-generator/cmd/conversion-gen"
2929
_ "k8s.io/code-generator/cmd/deepcopy-gen"

‎make/e2e.sh

+16-8
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ set -e
2424
_default_bindir=$(make print-bindir)
2525

2626
BINDIR=${BINDIR:-$_default_bindir}
27-
ARTIFACTS=${ARTIFACTS:-$(pwd)/$BINDIR/artifacts}
2827

2928
# Why do we only run 20 tests concurrently? Because we have noticed that
3029
# many tests start timing out when the Prow pod gets overloaded. We are
@@ -75,6 +74,7 @@ flake_attempts=1
7574
ginkgo_skip=
7675
ginkgo_focus=
7776
feature_gates=AdditionalCertificateOutputFormats=true,ExperimentalCertificateSigningRequestControllers=true,ExperimentalGatewayAPISupport=true
77+
artifacts="./$BINDIR/artifacts"
7878
help() {
7979
cat <<EOF | color ""
8080
Runs the end-to-end test suite against an already configured kind cluster.
@@ -106,7 +106,7 @@ Environment variables:
106106
to $feature_gates
107107
${green}ARTIFACTS${end}
108108
The path to a directory where the JUnit XML files will be stored. By
109-
default, the JUnit XML files are saved to ./$BINDIR/artifacts
109+
default, the JUnit XML files are saved to $artifacts
110110
111111
Details:
112112
Imagine you got the following failure:
@@ -149,7 +149,7 @@ if [ $# -gt 0 ]; then
149149
esac
150150
fi
151151

152-
for v in FEATURE_GATES FLAKE_ATTEMPTS NODES GINKGO_FOCUS GINKGO_SKIP; do
152+
for v in FEATURE_GATES FLAKE_ATTEMPTS NODES GINKGO_FOCUS GINKGO_SKIP ARTIFACTS; do
153153
if printenv "$v" >/dev/null && [ -n "${!v}" ]; then
154154
eval "$(tr '[:upper:]' '[:lower:]' <<<"$v")=\"${!v}\""
155155
fi
@@ -185,18 +185,26 @@ if [[ "${ginkgo_args[*]}" =~ ginkgo.focus ]]; then
185185
ginkgo_args+=(--ginkgo.v --test.v)
186186
fi
187187

188-
mkdir -p "${ARTIFACTS}"
188+
mkdir -p "$artifacts"
189189

190190
export CGO_ENABLED=0
191191

192192
trace ginkgo \
193-
-nodes "$nodes" \
194-
-flakeAttempts "$flake_attempts" \
195-
-tags e2e_test \
193+
-tags=e2e_test \
194+
-procs="$nodes" \
195+
-output-dir="$artifacts" \
196+
-junit-report="junit__01.xml" \
197+
-flake-attempts="$flake_attempts" \
198+
-timeout="24h" \
199+
-v \
200+
-randomize-all \
201+
-progress \
202+
-trace \
203+
-slow-spec-threshold="${GINKGO_SLOW_SPEC_THRESHOLD:-300s}" \
196204
./test/e2e/ \
197205
-- \
198206
--repo-root="$PWD" \
199-
--report-dir="${ARTIFACTS}" \
207+
--report-dir="$artifacts" \
200208
--acme-dns-server="${SERVICE_IP_PREFIX}.16" \
201209
--acme-ingress-ip="${SERVICE_IP_PREFIX}.15" \
202210
--acme-gateway-ip="${SERVICE_IP_PREFIX}.14" \

‎make/tools.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONTROLLER_GEN_VERSION=0.8.0
2121
COSIGN_VERSION=1.3.1
2222
CMREL_VERSION=a1e2bad95be9688794fd0571c4c40e88cccf9173
2323
K8S_RELEASE_NOTES_VERSION=0.7.0
24-
GATEWAY_API_VERSION = 0.4.1
24+
GATEWAY_API_VERSION=0.4.1
2525
GOIMPORTS_VERSION=0.1.8
2626
GOLICENSES_VERSION=1.2.1
2727
GOTESTSUM_VERSION=1.7.0
@@ -30,7 +30,7 @@ TRIVY_VERSION=0.30.4
3030
YTT_VERSION=0.36.0
3131
YQ_VERSION=4.25.3
3232
CRANE_VERSION=0.8.0
33-
GINKGO_VERSION=$(shell awk '/ginkgo/ {print $$2}' go.mod)
33+
GINKGO_VERSION=$(shell awk '/ginkgo\/v2/ {print $$2}' go.mod)
3434

3535
K8S_CODEGEN_VERSION=v0.24.2
3636

@@ -227,7 +227,7 @@ $(BINDIR)/tools/ginkgo: $(BINDIR)/downloaded/tools/ginkgo@$(GINKGO_VERSION) $(BI
227227
@cd $(dir $@) && $(LN) $(patsubst $(BINDIR)/%,../%,$<) $(notdir $@)
228228

229229
$(BINDIR)/downloaded/tools/ginkgo@$(GINKGO_VERSION): $(DEPENDS_ON_GO) | $(BINDIR)/downloaded/tools
230-
GOBIN=$(PWD)/$(dir $@) $(GO) install github.com/onsi/ginkgo/ginkgo@$(GINKGO_VERSION)
230+
GOBIN=$(PWD)/$(dir $@) $(GO) install github.com/onsi/ginkgo/v2/ginkgo@$(GINKGO_VERSION)
231231
@mv $(subst @$(GINKGO_VERSION),,$@) $@
232232

233233
#########

‎test/e2e/e2e.go

+26-31
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@ import (
2020
"os"
2121
"path"
2222

23-
"github.com/onsi/ginkgo"
23+
"github.com/onsi/ginkgo/v2"
2424

2525
"github.com/cert-manager/cert-manager/test/e2e/framework"
2626
"github.com/cert-manager/cert-manager/test/e2e/framework/addon"
2727
"github.com/cert-manager/cert-manager/test/e2e/framework/log"
2828
)
2929

30-
var (
31-
cfg = framework.DefaultConfig
32-
)
30+
var cfg = framework.DefaultConfig
3331

3432
var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
3533
addon.InitGlobals(cfg)
@@ -49,36 +47,33 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
4947
}
5048
})
5149

52-
var globalLogs map[string]string
50+
var _ = ginkgo.SynchronizedAfterSuite(func() {}, func() {
51+
ginkgo.By("Retrieving logs for global addons")
52+
globalLogs, err := addon.GlobalLogs()
53+
if err != nil {
54+
log.Logf("Failed to retrieve global addon logs: " + err.Error())
55+
}
56+
57+
for k, v := range globalLogs {
58+
outPath := path.Join(cfg.Ginkgo.ReportDirectory, "logs", k)
5359

54-
var _ = ginkgo.SynchronizedAfterSuite(func() {},
55-
func() {
56-
ginkgo.By("Retrieving logs for global addons")
57-
var err error
58-
globalLogs, err = addon.GlobalLogs()
60+
// Create a directory for the file if needed
61+
err := os.MkdirAll(path.Dir(outPath), 0755)
5962
if err != nil {
60-
log.Logf("Failed to retrieve global addon logs: " + err.Error())
61-
}
62-
63-
for k, v := range globalLogs {
64-
outPath := path.Join(framework.DefaultConfig.Ginkgo.ReportDirectory, "logs", k)
65-
// Create a directory for the file if needed
66-
err := os.MkdirAll(path.Dir(outPath), 0755)
67-
if err != nil {
68-
log.Logf("Failed to create directory for logs: %v", err)
69-
continue
70-
}
71-
72-
err = os.WriteFile(outPath, []byte(v), 0644)
73-
if err != nil {
74-
log.Logf("Failed to write log file: %v", err)
75-
continue
76-
}
63+
log.Logf("Failed to create directory for logs: %v", err)
64+
continue
7765
}
7866

79-
ginkgo.By("Cleaning up the provisioned globals")
80-
err = addon.DeprovisionGlobals(cfg)
67+
err = os.WriteFile(outPath, []byte(v), 0644)
8168
if err != nil {
82-
framework.Failf("Error deprovisioning global addons: %v", err)
69+
log.Logf("Failed to write log file: %v", err)
70+
continue
8371
}
84-
})
72+
}
73+
74+
ginkgo.By("Cleaning up the provisioned globals")
75+
err = addon.DeprovisionGlobals(cfg)
76+
if err != nil {
77+
framework.Failf("Error deprovisioning global addons: %v", err)
78+
}
79+
})

‎test/e2e/e2e_test.go

+5-42
Original file line numberDiff line numberDiff line change
@@ -20,69 +20,32 @@ package e2e
2020

2121
import (
2222
"flag"
23-
"fmt"
24-
"path"
2523
"testing"
2624
"time"
2725

28-
"github.com/onsi/ginkgo"
29-
ginkgoconfig "github.com/onsi/ginkgo/config"
30-
"github.com/onsi/ginkgo/reporters"
26+
"github.com/onsi/ginkgo/v2"
3127
"github.com/onsi/gomega"
3228
"k8s.io/apimachinery/pkg/util/wait"
3329

3430
"github.com/cert-manager/cert-manager/pkg/logs"
35-
"github.com/cert-manager/cert-manager/test/e2e/framework"
3631
_ "github.com/cert-manager/cert-manager/test/e2e/suite"
3732
)
3833

39-
var featureGates string
40-
4134
func init() {
4235
logs.InitLogs(flag.CommandLine)
43-
framework.DefaultConfig.AddFlags(flag.CommandLine)
44-
45-
// Turn on verbose by default to get spec names
46-
ginkgoconfig.DefaultReporterConfig.Verbose = true
47-
// Turn on EmitSpecProgress to get spec progress (especially on interrupt)
48-
ginkgoconfig.GinkgoConfig.EmitSpecProgress = true
49-
// Randomize specs as well as suites
50-
ginkgoconfig.GinkgoConfig.RandomizeAllSpecs = true
36+
cfg.AddFlags(flag.CommandLine)
5137

5238
wait.ForeverTestTimeout = time.Second * 60
5339
}
5440

5541
func TestE2E(t *testing.T) {
5642
defer logs.FlushLogs()
57-
flag.Parse()
5843

59-
// Disable skipped tests unless they are explicitly requested.
60-
// Copied from https://github.com/kubernetes/kubernetes/blob/960e5e78255dd148d4dae49f62e729ea940f4f07/test/e2e/e2e.go#L103-L106
61-
// See https://github.com/kubernetes/community/blob/master/contributors/devel/sig-testing/flaky-tests.md#quarantining-flakes
62-
if len(ginkgoconfig.GinkgoConfig.FocusStrings) == 0 && len(ginkgoconfig.GinkgoConfig.SkipStrings) == 0 {
63-
ginkgoconfig.GinkgoConfig.SkipStrings = []string{`\[Flaky\]`}
64-
}
65-
66-
if err := framework.DefaultConfig.Validate(); err != nil {
67-
t.Fatalf("Invalid test config: %v", err)
68-
}
69-
70-
gomega.NewWithT(t)
7144
gomega.RegisterFailHandler(ginkgo.Fail)
7245

73-
// TODO: properly make use of default SkipString
74-
// Disable skipped tests unless they are explicitly requested.
75-
// if ginkgoconfig.GinkgoConfig.FocusString == "" && ginkgoconfig.GinkgoConfig.SkipString == "" {
76-
// ginkgoconfig.GinkgoConfig.SkipString = `\[Flaky\]|\[Feature:.+\]`
77-
// }
78-
79-
var r []ginkgo.Reporter
80-
if framework.DefaultConfig.Ginkgo.ReportDirectory != "" {
81-
r = append(r, reporters.NewJUnitReporter(path.Join(framework.DefaultConfig.Ginkgo.ReportDirectory,
82-
fmt.Sprintf("junit_%s_%02d.xml",
83-
framework.DefaultConfig.Ginkgo.ReportPrefix,
84-
ginkgoconfig.GinkgoConfig.ParallelNode))))
46+
if err := cfg.Validate(); err != nil {
47+
t.Fatalf("Invalid test config: %v", err)
8548
}
8649

87-
ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "cert-manager e2e suite", r)
50+
ginkgo.RunSpecs(t, "cert-manager e2e suite")
8851
}

‎test/e2e/framework/addon/chart/addon.go

+28-3
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,22 @@ func (c *Chart) runInstall() error {
146146
}
147147

148148
cmd := c.buildHelmCmd(args...)
149-
err := cmd.Run()
149+
cmd.Stdout = nil
150+
out, err := cmd.StdoutPipe()
150151
if err != nil {
151152
return err
152153
}
154+
defer out.Close()
155+
156+
err = cmd.Run()
157+
if err != nil {
158+
_, err2 := io.Copy(os.Stdout, out)
159+
if err2 != nil {
160+
return fmt.Errorf("cmd.Run: %v: io.Copy: %v", err, err2)
161+
}
162+
163+
return fmt.Errorf("cmd.Run: %v", err)
164+
}
153165

154166
return nil
155167
}
@@ -189,10 +201,23 @@ func (c *Chart) getHelmVersion() (string, error) {
189201

190202
// Deprovision the deployed instance of tiller-deploy
191203
func (c *Chart) Deprovision() error {
192-
err := c.buildHelmCmd("delete", "--namespace", c.Namespace, c.ReleaseName).Run()
204+
cmd := c.buildHelmCmd("delete", "--namespace", c.Namespace, c.ReleaseName)
205+
cmd.Stdout = nil
206+
out, err := cmd.StdoutPipe()
193207
if err != nil {
208+
return err
209+
}
210+
defer out.Close()
211+
212+
err = cmd.Run()
213+
if err != nil {
214+
_, err2 := io.Copy(os.Stdout, out)
215+
if err2 != nil {
216+
return fmt.Errorf("cmd.Run: %v: io.Copy: %v", err, err2)
217+
}
218+
194219
// Ignore deprovisioning errors
195-
// TODO: only ignore failed to delete because it doesn't exist errors
220+
// TODO: only ignore "failed to delete because it doesn't exist" errors
196221
return nil
197222
}
198223

‎test/e2e/framework/config/ginkgo.go

-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@ import (
2222

2323
type Ginkgo struct {
2424
ReportDirectory string
25-
ReportPrefix string
2625
}
2726

2827
func (g *Ginkgo) AddFlags(fs *flag.FlagSet) {
2928
fs.StringVar(&g.ReportDirectory, "report-dir", "", "Optional directory to store junit output in. If not specified, no junit file will be output")
30-
fs.StringVar(&g.ReportPrefix, "report-prefix", "", "Optional prefix for JUnit XML reports. Default is empty, which doesn't prepend anything to the default name")
3129
}
3230

3331
func (c *Ginkgo) Validate() []error {

0 commit comments

Comments
 (0)