Skip to content

Commit 184bbf0

Browse files
soltyshsoltysh
committed
Adopt to v2 by migrating from CurrentGinkgoTestDescription() to CurrentSpecReport()
1 parent 0a9037b commit 184bbf0

Some content is hidden

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

82 files changed

+117
-117
lines changed

‎test/extended/builds/build_pruning.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] prune builds based on settings
4747
})
4848

4949
g.AfterEach(func() {
50-
if g.CurrentGinkgoTestDescription().Failed {
50+
if g.CurrentSpecReport().Failed() {
5151
exutil.DumpPodStates(oc)
5252
exutil.DumpConfigMapStates(oc)
5353
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/build_timing.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][timing] capture build stages an
4848
})
4949

5050
g.AfterEach(func() {
51-
if g.CurrentGinkgoTestDescription().Failed {
51+
if g.CurrentSpecReport().Failed() {
5252
exutil.DumpPodStates(oc)
5353
exutil.DumpConfigMapStates(oc)
5454
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/buildconfigsecretinjector.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] buildconfig secret injector", f
2727
})
2828

2929
g.AfterEach(func() {
30-
if g.CurrentGinkgoTestDescription().Failed {
30+
if g.CurrentSpecReport().Failed() {
3131
exutil.DumpPodStates(oc)
3232
exutil.DumpPodLogsStartingWith("", oc)
3333
}

‎test/extended/builds/cluster_config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Serial][Slow][Disruptive] alter
172172
})
173173

174174
g.JustAfterEach(func() {
175-
if g.CurrentGinkgoTestDescription().Failed {
175+
if g.CurrentSpecReport().Failed() {
176176
exutil.DumpPodStates(oc)
177177
exutil.DumpPodLogsStartingWith("", oc)
178178
exutil.DumpConfigMapStates(oc)

‎test/extended/builds/completiondeadlineseconds.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] builds should have deadli
2828
})
2929

3030
g.AfterEach(func() {
31-
if g.CurrentGinkgoTestDescription().Failed {
31+
if g.CurrentSpecReport().Failed() {
3232
exutil.DumpPodStates(oc)
3333
exutil.DumpConfigMapStates(oc)
3434
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/contextdir.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] builds with a context dir
3737
})
3838

3939
g.AfterEach(func() {
40-
if g.CurrentGinkgoTestDescription().Failed {
40+
if g.CurrentSpecReport().Failed() {
4141
exutil.DumpPodStates(oc)
4242
exutil.DumpConfigMapStates(oc)
4343
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/controller_compat.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] build controller", func()
1919
})
2020

2121
g.AfterEach(func() {
22-
if g.CurrentGinkgoTestDescription().Failed {
22+
if g.CurrentSpecReport().Failed() {
2323
exutil.DumpPodStates(oc)
2424
exutil.DumpPodLogsStartingWith("", oc)
2525
}

‎test/extended/builds/custom_build.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] custom build with buildah", fun
2626
})
2727

2828
g.AfterEach(func() {
29-
if g.CurrentGinkgoTestDescription().Failed {
29+
if g.CurrentSpecReport().Failed() {
3030
exutil.DumpPodStates(oc)
3131
exutil.DumpConfigMapStates(oc)
3232
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/digest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] completed builds should h
3434
})
3535

3636
g.AfterEach(func() {
37-
if g.CurrentGinkgoTestDescription().Failed {
37+
if g.CurrentSpecReport().Failed() {
3838
exutil.DumpPodStates(oc)
3939
exutil.DumpConfigMapStates(oc)
4040
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/docker_pullsearch.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][pullsearch] docker build where
2323
})
2424

2525
g.AfterEach(func() {
26-
if g.CurrentGinkgoTestDescription().Failed {
26+
if g.CurrentSpecReport().Failed() {
2727
exutil.DumpPodStates(oc)
2828
exutil.DumpConfigMapStates(oc)
2929
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/docker_pullsecret.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][pullsecret] docker build using
3030
})
3131

3232
g.AfterEach(func() {
33-
if g.CurrentGinkgoTestDescription().Failed {
33+
if g.CurrentSpecReport().Failed() {
3434
exutil.DumpPodStates(oc)
3535
exutil.DumpConfigMapStates(oc)
3636
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/dockerfile.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ USER 1001
4343
})
4444

4545
g.AfterEach(func() {
46-
if g.CurrentGinkgoTestDescription().Failed {
46+
if g.CurrentSpecReport().Failed() {
4747
exutil.DumpPodStates(oc)
4848
exutil.DumpConfigMapStates(oc)
4949
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/failure_status.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] update failure status", f
4646
})
4747

4848
g.AfterEach(func() {
49-
if g.CurrentGinkgoTestDescription().Failed {
49+
if g.CurrentSpecReport().Failed() {
5050
exutil.DumpPodStates(oc)
5151
exutil.DumpConfigMapStates(oc)
5252
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/gitauth.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] can use private repositor
3535
})
3636

3737
g.AfterEach(func() {
38-
if g.CurrentGinkgoTestDescription().Failed {
38+
if g.CurrentSpecReport().Failed() {
3939
exutil.DumpPodStates(oc)
4040
exutil.DumpConfigMapStates(oc)
4141
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/hooks.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] testing build configurati
3131
})
3232

3333
g.AfterEach(func() {
34-
if g.CurrentGinkgoTestDescription().Failed {
34+
if g.CurrentSpecReport().Failed() {
3535
exutil.DumpPodStates(oc)
3636
exutil.DumpConfigMapStates(oc)
3737
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/image_source.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] build can have container
6767
})
6868

6969
g.AfterEach(func() {
70-
if g.CurrentGinkgoTestDescription().Failed {
70+
if g.CurrentSpecReport().Failed() {
7171
exutil.DumpPodStates(oc)
7272
exutil.DumpConfigMapStates(oc)
7373
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/imagechangetriggers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] imagechangetriggers", func() {
2828
})
2929

3030
g.AfterEach(func() {
31-
if g.CurrentGinkgoTestDescription().Failed {
31+
if g.CurrentSpecReport().Failed() {
3232
exutil.DumpPodStates(oc)
3333
exutil.DumpConfigMapStates(oc)
3434
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/labels.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] result image should have proper
2929
})
3030

3131
g.AfterEach(func() {
32-
if g.CurrentGinkgoTestDescription().Failed {
32+
if g.CurrentSpecReport().Failed() {
3333
exutil.DumpPodStates(oc)
3434
exutil.DumpConfigMapStates(oc)
3535
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/multistage.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ COPY --from=%[2]s /bin/ping /test/
3535
)
3636

3737
g.AfterEach(func() {
38-
if g.CurrentGinkgoTestDescription().Failed {
38+
if g.CurrentSpecReport().Failed() {
3939
exutil.DumpPodStates(oc)
4040
exutil.DumpConfigMapStates(oc)
4141
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/new_app.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ var _ = g.Describe("[sig-builds][Feature:Builds] oc new-app", func() {
4343
})
4444

4545
g.AfterEach(func() {
46-
if g.CurrentGinkgoTestDescription().Failed {
46+
if g.CurrentSpecReport().Failed() {
4747
exutil.DumpPodStates(oc)
4848
exutil.DumpConfigMapStates(oc)
4949
exutil.DumpPodLogsStartingWith("", oc)
5050
}
51-
deployutil.DeploymentConfigFailureTrap(oc, a58, g.CurrentGinkgoTestDescription().Failed)
52-
deployutil.DeploymentConfigFailureTrap(oc, a59, g.CurrentGinkgoTestDescription().Failed)
51+
deployutil.DeploymentConfigFailureTrap(oc, a58, g.CurrentSpecReport().Failed())
52+
deployutil.DeploymentConfigFailureTrap(oc, a59, g.CurrentSpecReport().Failed())
5353
})
5454

5555
g.It("should succeed with a --name of 58 characters [apigroup:build.openshift.io]", func() {

‎test/extended/builds/no_outputname.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] build without output image", fu
2626
})
2727

2828
g.AfterEach(func() {
29-
if g.CurrentGinkgoTestDescription().Failed {
29+
if g.CurrentSpecReport().Failed() {
3030
exutil.DumpPodStates(oc)
3131
exutil.DumpConfigMapStates(oc)
3232
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/nosrc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] build with empty source", func(
3232
})
3333

3434
g.AfterEach(func() {
35-
if g.CurrentGinkgoTestDescription().Failed {
35+
if g.CurrentSpecReport().Failed() {
3636
exutil.DumpPodStates(oc)
3737
exutil.DumpConfigMapStates(oc)
3838
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/optimized.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ USER 1001
3838
})
3939

4040
g.AfterEach(func() {
41-
if g.CurrentGinkgoTestDescription().Failed {
41+
if g.CurrentSpecReport().Failed() {
4242
exutil.DumpPodStates(oc)
4343
exutil.DumpConfigMapStates(oc)
4444
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/pipeline_origin_bld.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var _ = g.Describe("[sig-builds][Feature:JenkinsRHELImagesOnly][Feature:Jenkins]
2323
simplePipelineBC = exutil.FixturePath("testdata", "builds", "simple-pipeline-bc.yaml")
2424

2525
cleanup = func() {
26-
if g.CurrentGinkgoTestDescription().Failed {
26+
if g.CurrentSpecReport().Failed() {
2727
exutil.DumpPodStates(oc)
2828
exutil.DumpPodLogsStartingWith("", oc)
2929
}

‎test/extended/builds/proxy.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] builds should support pro
2929
})
3030

3131
g.AfterEach(func() {
32-
if g.CurrentGinkgoTestDescription().Failed {
32+
if g.CurrentSpecReport().Failed() {
3333
exutil.DumpPodStates(oc)
3434
exutil.DumpConfigMapStates(oc)
3535
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/pullsecret.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] using pull secrets in a b
2929

3030
g.Context("start-build test context", func() {
3131
g.AfterEach(func() {
32-
if g.CurrentGinkgoTestDescription().Failed {
32+
if g.CurrentSpecReport().Failed() {
3333
exutil.DumpPodStates(oc)
3434
exutil.DumpPodLogsStartingWith("", oc)
3535
}

‎test/extended/builds/remove_buildconfig.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] remove all builds when build co
3131
})
3232

3333
g.AfterEach(func() {
34-
if g.CurrentGinkgoTestDescription().Failed {
34+
if g.CurrentSpecReport().Failed() {
3535
exutil.DumpBuilds(oc)
3636
exutil.DumpPodStates(oc)
3737
exutil.DumpConfigMapStates(oc)

‎test/extended/builds/revision.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] build have source revision meta
3030
})
3131

3232
g.AfterEach(func() {
33-
if g.CurrentGinkgoTestDescription().Failed {
33+
if g.CurrentSpecReport().Failed() {
3434
exutil.DumpPodStates(oc)
3535
exutil.DumpConfigMapStates(oc)
3636
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/run_fs_verification.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ valid_fields.json
102102
})
103103

104104
g.AfterEach(func() {
105-
if g.CurrentGinkgoTestDescription().Failed {
105+
if g.CurrentSpecReport().Failed() {
106106
exutil.DumpPodStates(oc)
107107
exutil.DumpPodLogsStartingWith("verify-run-fs", oc)
108108
}

‎test/extended/builds/run_policy.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] using build configuration
5151
})
5252

5353
g.AfterEach(func() {
54-
if g.CurrentGinkgoTestDescription().Failed {
54+
if g.CurrentSpecReport().Failed() {
5555
exutil.DumpPodStates(oc)
5656
exutil.DumpConfigMapStates(oc)
5757
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/s2i_dropcaps.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] Capabilities should be dr
2323
})
2424

2525
g.AfterEach(func() {
26-
if g.CurrentGinkgoTestDescription().Failed {
26+
if g.CurrentSpecReport().Failed() {
2727
exutil.DumpPodStates(oc)
2828
exutil.DumpConfigMapStates(oc)
2929
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/s2i_env.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] s2i build with environmen
3636
})
3737

3838
g.AfterEach(func() {
39-
if g.CurrentGinkgoTestDescription().Failed {
39+
if g.CurrentSpecReport().Failed() {
4040
exutil.DumpPodStates(oc)
4141
exutil.DumpConfigMapStates(oc)
4242
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/s2i_incremental.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] incremental s2i build", f
3636
})
3737

3838
g.AfterEach(func() {
39-
if g.CurrentGinkgoTestDescription().Failed {
39+
if g.CurrentSpecReport().Failed() {
4040
exutil.DumpPodStates(oc)
4141
exutil.DumpConfigMapStates(oc)
4242
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/s2i_quota.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] s2i build with a quota", func()
3232
})
3333

3434
g.AfterEach(func() {
35-
if g.CurrentGinkgoTestDescription().Failed {
35+
if g.CurrentSpecReport().Failed() {
3636
exutil.DumpPodStates(oc)
3737
exutil.DumpConfigMapStates(oc)
3838
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/s2i_root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func Before(oc *exutil.CLI) {
2323
}
2424

2525
func After(oc *exutil.CLI) {
26-
if g.CurrentGinkgoTestDescription().Failed {
26+
if g.CurrentSpecReport().Failed() {
2727
exutil.DumpPodStates(oc)
2828
exutil.DumpConfigMapStates(oc)
2929
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/secrets.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] can use build secrets", f
3434
})
3535

3636
g.AfterEach(func() {
37-
if g.CurrentGinkgoTestDescription().Failed {
37+
if g.CurrentSpecReport().Failed() {
3838
exutil.DumpPodStates(oc)
3939
exutil.DumpConfigMapStates(oc)
4040
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN curl -vvv hello-nodejs:8080
3434
})
3535

3636
g.AfterEach(func() {
37-
if g.CurrentGinkgoTestDescription().Failed {
37+
if g.CurrentSpecReport().Failed() {
3838
exutil.DumpPodStates(oc)
3939
exutil.DumpConfigMapStates(oc)
4040
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/start.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] starting a build using CL
5757

5858
g.Context("start-build test context", func() {
5959
g.AfterEach(func() {
60-
if g.CurrentGinkgoTestDescription().Failed {
60+
if g.CurrentSpecReport().Failed() {
6161
exutil.DumpPodStates(oc)
6262
exutil.DumpPodLogsStartingWith("", oc)
6363
}

‎test/extended/builds/valuefrom.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][valueFrom] process valueFrom in
3131
})
3232

3333
g.AfterEach(func() {
34-
if g.CurrentGinkgoTestDescription().Failed {
34+
if g.CurrentSpecReport().Failed() {
3535
exutil.DumpPodStates(oc)
3636
exutil.DumpConfigMapStates(oc)
3737
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/builds/volumes.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][volumes] build volumes", func()
5252
})
5353

5454
g.AfterEach(func() {
55-
if g.CurrentGinkgoTestDescription().Failed {
55+
if g.CurrentSpecReport().Failed() {
5656
exutil.DumpPodStates(oc)
5757
exutil.DumpConfigMapStates(oc)
5858
exutil.DumpPodLogsStartingWith("", oc)
@@ -159,7 +159,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][volumes] csi build volumes with
159159
})
160160

161161
g.AfterEach(func() {
162-
if g.CurrentGinkgoTestDescription().Failed {
162+
if g.CurrentSpecReport().Failed() {
163163
exutil.DumpPodStates(oc)
164164
exutil.DumpConfigMapStates(oc)
165165
exutil.DumpPodLogsStartingWith("", oc)
@@ -267,7 +267,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][volumes] csi build volumes with
267267
})
268268

269269
g.AfterEach(func() {
270-
if g.CurrentGinkgoTestDescription().Failed {
270+
if g.CurrentSpecReport().Failed() {
271271
exutil.DumpPodStates(oc)
272272
exutil.DumpConfigMapStates(oc)
273273
exutil.DumpPodLogsStartingWith("", oc)

‎test/extended/cli/compat.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var _ = g.Describe("[sig-cli] oc", func() {
2222
var ns string
2323

2424
g.AfterEach(func() {
25-
if g.CurrentGinkgoTestDescription().Failed && len(ns) > 0 {
25+
if g.CurrentSpecReport().Failed() && len(ns) > 0 {
2626
exutil.DumpPodLogsStartingWithInNamespace("", ns, oc)
2727
}
2828
})

0 commit comments

Comments
 (0)