Updated test file location

redhat-developer · Jul 4, 2019 · 52e7a22 · 52e7a22
1 parent cac9f34
commit 52e7a22
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -47,7 +47,6 @@ jobs:
         - make bin
         - sudo cp odo /usr/bin
         - oc login -u developer
-        - travis_wait make test-java-e2e
 
     - <<: *base-test
       stage: test
@@ -57,7 +56,6 @@ jobs:
         - make bin
         - sudo cp odo /usr/bin
         - oc login -u developer
-        - travis_wait make test-source-e2e
         - travis_wait make test-json-format-output
         - travis_wait make test-cmd-pref-config
         - travis_wait make test-cmd-url

diff --git a/Makefile b/Makefile
@@ -127,12 +127,12 @@ test-cmd-cmp-sub:
 # Run java e2e tests
 .PHONY: test-java-e2e
 test-java-e2e:
-	go test -v github.com/openshift/odo/tests/integration --ginkgo.focus="odoJavaE2e" -ginkgo.slowSpecThreshold=$(SLOW_SPEC_THRESHOLD) -ginkgo.v -timeout $(TIMEOUT)
+	go test -v github.com/openshift/odo/tests/e2escenarios --ginkgo.focus="odo java e2e tests" -ginkgo.slowSpecThreshold=$(SLOW_SPEC_THRESHOLD) -ginkgo.v -timeout $(TIMEOUT)
 
 # Run source e2e tests
 .PHONY: test-source-e2e
 test-source-e2e:
-	go test -v github.com/openshift/odo/tests/integration --ginkgo.focus="odoSourceE2e" -ginkgo.slowSpecThreshold=$(SLOW_SPEC_THRESHOLD) -ginkgo.v -timeout $(TIMEOUT)
+	go test -v github.com/openshift/odo/tests/e2escenarios --ginkgo.focus="odo source e2e tests" -ginkgo.slowSpecThreshold=$(SLOW_SPEC_THRESHOLD) -ginkgo.v -timeout $(TIMEOUT)
 
 # Run odo service command tests
 .PHONY: test-cmd-service

diff --git a/scripts/openshiftci-presubmit-e2etests.sh b/scripts/openshiftci-presubmit-e2etests.sh
@@ -12,4 +12,6 @@ make bin
 export PATH="$PATH:$(pwd)"
 export CUSTOM_HOMEDIR="/tmp/artifacts"
 
-make test-e2e-scenarios
+make test-e2e-scenarios
+make test-java-e2e
+make test-source-e2e
diff --git a/tests/integration/java_test.go → tests/e2escenarios/java_test.go b/tests/integration/java_test.go → tests/e2escenarios/java_test.go
@@ -1,4 +1,4 @@
-package integration
+package e2escenarios
 
 import (
 	"os"
@@ -11,7 +11,7 @@ import (
 
 const javaFiles = "examples/binary/java/"
 
-var _ = Describe("odoJavaE2e", func() {
+var _ = Describe("odo java e2e tests", func() {
 	var project string
 	var oc helper.OcRunner
 	// This is run after every Spec (It)

diff --git a/tests/integration/source_test.go → tests/e2escenarios/source_test.go b/tests/integration/source_test.go → tests/e2escenarios/source_test.go
@@ -1,4 +1,4 @@
-package integration
+package e2escenarios
 
 import (
 	"path/filepath"
@@ -9,7 +9,7 @@ import (
 	"github.com/openshift/odo/tests/helper"
 )
 
-var _ = Describe("odoSourceE2e", func() {
+var _ = Describe("odo source e2e tests", func() {
 	var project string
 	var context string
 	var oc helper.OcRunner