Rebased was required

redhat-developer · Mar 11, 2022 · 0d43554 · 0d43554
1 parent dbd8814
commit 0d43554
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/.ibm/pipelines/kubernetes-tests.sh b/.ibm/pipelines/kubernetes-tests.sh
@@ -14,7 +14,7 @@ cleanup_namespaces
     set -e
     make install
     make test-integration-devfile
-    make test-integration-interactive
+    make test-interactive
     make test-e2e-devfile
     make test-cmd-project
 ) |& tee "/tmp/${LOGFILE}"

diff --git a/.ibm/pipelines/openshift-tests.sh b/.ibm/pipelines/openshift-tests.sh
@@ -12,7 +12,7 @@ cleanup_namespaces
     set -e
     make install
     make test-integration
-    make test-integration-interactive
+    make test-interactive
     make test-integration-devfile
     make test-cmd-login-logout
     make test-cmd-project

diff --git a/Makefile b/Makefile
@@ -266,9 +266,9 @@ test-cmd-debug: install ## Run odo debug command tests
 test-integration: install ## Run command's integration tests irrespective of service catalog status in the cluster.
 	$(RUN_GINKGO) $(GINKGO_FLAGS) tests/integration/
 
-.PHONY: test-interactive test
-test-integration-interactive: install ## Run integration interactive tests
-	$(RUN_GINKGO) $(GINKGO_FLAGS) tests/integration/interactive/
+.PHONY: test-interactive
+test-interactive: install ## Run integration interactive tests
+	$(RUN_GINKGO) $(GINKGO_FLAGS) tests/interactive/
 
 .PHONY: test-integration-devfile
 test-integration-devfile: install ## Run devfile integration tests

diff --git a/...ntegration/interactive/cmd_deploy_test.go → tests/interactive/cmd_deploy_test.go b/...ntegration/interactive/cmd_deploy_test.go → tests/interactive/cmd_deploy_test.go
diff --git a/...s/integration/interactive/cmd_dev_test.go → tests/interactive/cmd_dev_test.go b/...s/integration/interactive/cmd_dev_test.go → tests/interactive/cmd_dev_test.go
diff --git a/.../integration/interactive/cmd_init_test.go → tests/interactive/cmd_init_test.go b/.../integration/interactive/cmd_init_test.go → tests/interactive/cmd_init_test.go
diff --git a/...tion/interactive/interactive_suit_test.go → tests/interactive/interactive_suit_test.go b/...tion/interactive/interactive_suit_test.go → tests/interactive/interactive_suit_test.go