Skip to content

Commit e72143c

Browse files
author
OpenShift Bot
authored
Merge pull request #9608 from rhcarvalho/extended-fixturepath
Merged by openshift-bot
2 parents a15fe31 + 2622eaf commit e72143c

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

‎test/extended/builds/completiondeadlineseconds.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
var _ = g.Describe("[builds][Slow] builds should have deadlines", func() {
1414
defer g.GinkgoRecover()
1515
var (
16-
sourceFixture = exutil.FixturePath("..", "extended", "testdata", "test-cds-sourcebuild.json")
17-
dockerFixture = exutil.FixturePath("..", "extended", "testdata", "test-cds-dockerbuild.json")
16+
sourceFixture = exutil.FixturePath("testdata", "test-cds-sourcebuild.json")
17+
dockerFixture = exutil.FixturePath("testdata", "test-cds-dockerbuild.json")
1818
oc = exutil.NewCLI("cli-start-build", exutil.KubeConfigPath())
1919
)
2020

‎test/extended/builds/nosrc.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
var _ = g.Describe("[builds] build with empty source", func() {
1313
defer g.GinkgoRecover()
1414
var (
15-
buildFixture = exutil.FixturePath("..", "extended", "testdata", "test-nosrc-build.json")
15+
buildFixture = exutil.FixturePath("testdata", "test-nosrc-build.json")
1616
oc = exutil.NewCLI("cli-build-nosrc", exutil.KubeConfigPath())
17-
exampleBuild = exutil.FixturePath("..", "extended", "testdata", "test-build-app")
17+
exampleBuild = exutil.FixturePath("testdata", "test-build-app")
1818
)
1919

2020
g.JustBeforeEach(func() {

‎test/extended/builds/proxy.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
var _ = g.Describe("[builds][Slow] the s2i build should support proxies", func() {
1515
defer g.GinkgoRecover()
1616
var (
17-
buildFixture = exutil.FixturePath("..", "extended", "testdata", "test-build-proxy.json")
17+
buildFixture = exutil.FixturePath("testdata", "test-build-proxy.json")
1818
oc = exutil.NewCLI("build-proxy", exutil.KubeConfigPath())
1919
)
2020

‎test/extended/builds/remove_buildconfig.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
var _ = g.Describe("[builds][Conformance] remove all builds when build configuration is removed", func() {
1515
defer g.GinkgoRecover()
1616
var (
17-
buildFixture = exutil.FixturePath("..", "extended", "testdata", "test-build.json")
17+
buildFixture = exutil.FixturePath("testdata", "test-build.json")
1818
oc = exutil.NewCLI("cli-remove-build", exutil.KubeConfigPath())
1919
)
2020

‎test/extended/builds/revision.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
var _ = g.Describe("[builds] build have source revision metadata", func() {
1313
defer g.GinkgoRecover()
1414
var (
15-
buildFixture = exutil.FixturePath("..", "extended", "testdata", "test-build-revision.json")
15+
buildFixture = exutil.FixturePath("testdata", "test-build-revision.json")
1616
oc = exutil.NewCLI("cli-build-revision", exutil.KubeConfigPath())
1717
)
1818

‎test/extended/builds/run_policy.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var _ = g.Describe("[builds][Slow] using build configuration runPolicy", func()
2727
err := exutil.WaitForBuilderAccount(oc.KubeREST().ServiceAccounts(oc.Namespace()))
2828
o.Expect(err).NotTo(o.HaveOccurred())
2929
// Create all fixtures
30-
oc.Run("create").Args("-f", exutil.FixturePath("..", "extended", "testdata", "run_policy")).Execute()
30+
oc.Run("create").Args("-f", exutil.FixturePath("testdata", "run_policy")).Execute()
3131
})
3232

3333
g.Describe("build configuration with Parallel build run policy", func() {

‎test/extended/builds/s2i_dropcaps.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
var _ = g.Describe("[builds][Slow] Capabilities should be dropped for s2i builders", func() {
1616
defer g.GinkgoRecover()
1717
var (
18-
s2ibuilderFixture = exutil.FixturePath("..", "extended", "testdata", "s2i-dropcaps", "rootable-ruby")
19-
rootAccessBuildFixture = exutil.FixturePath("..", "extended", "testdata", "s2i-dropcaps", "root-access-build.yaml")
18+
s2ibuilderFixture = exutil.FixturePath("testdata", "s2i-dropcaps", "rootable-ruby")
19+
rootAccessBuildFixture = exutil.FixturePath("testdata", "s2i-dropcaps", "root-access-build.yaml")
2020
oc = exutil.NewCLI("build-s2i-dropcaps", exutil.KubeConfigPath())
2121
)
2222

‎test/extended/builds/start.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
var _ = g.Describe("[builds][Slow] starting a build using CLI", func() {
1717
defer g.GinkgoRecover()
1818
var (
19-
buildFixture = exutil.FixturePath("..", "extended", "testdata", "test-build.json")
20-
exampleGemfile = exutil.FixturePath("..", "extended", "testdata", "test-build-app", "Gemfile")
21-
exampleBuild = exutil.FixturePath("..", "extended", "testdata", "test-build-app")
19+
buildFixture = exutil.FixturePath("testdata", "test-build.json")
20+
exampleGemfile = exutil.FixturePath("testdata", "test-build-app", "Gemfile")
21+
exampleBuild = exutil.FixturePath("testdata", "test-build-app")
2222
oc = exutil.NewCLI("cli-start-build", exutil.KubeConfigPath())
2323
)
2424

‎test/extended/deployments/deployments.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ var _ = g.Describe("deploymentconfigs", func() {
2323
defer g.GinkgoRecover()
2424
var (
2525
oc = exutil.NewCLI("cli-deployment", exutil.KubeConfigPath())
26-
deploymentFixture = exutil.FixturePath("..", "extended", "testdata", "test-deployment-test.yaml")
27-
simpleDeploymentFixture = exutil.FixturePath("..", "extended", "testdata", "deployment-simple.yaml")
28-
customDeploymentFixture = exutil.FixturePath("..", "extended", "testdata", "custom-deployment.yaml")
29-
generationFixture = exutil.FixturePath("..", "extended", "testdata", "test-deployment.yaml")
30-
pausedDeploymentFixture = exutil.FixturePath("..", "extended", "testdata", "paused-deployment.yaml")
31-
failedHookFixture = exutil.FixturePath("..", "extended", "testdata", "failing-pre-hook.yaml")
32-
brokenDeploymentFixture = exutil.FixturePath("..", "extended", "testdata", "test-deployment-broken.yaml")
26+
deploymentFixture = exutil.FixturePath("testdata", "test-deployment-test.yaml")
27+
simpleDeploymentFixture = exutil.FixturePath("testdata", "deployment-simple.yaml")
28+
customDeploymentFixture = exutil.FixturePath("testdata", "custom-deployment.yaml")
29+
generationFixture = exutil.FixturePath("testdata", "test-deployment.yaml")
30+
pausedDeploymentFixture = exutil.FixturePath("testdata", "paused-deployment.yaml")
31+
failedHookFixture = exutil.FixturePath("testdata", "failing-pre-hook.yaml")
32+
brokenDeploymentFixture = exutil.FixturePath("testdata", "test-deployment-broken.yaml")
3333
)
3434

3535
g.Describe("when run iteratively", func() {

0 commit comments

Comments
 (0)