alihan/odo
1
0
Fork 0
mirror of https://github.com/redhat-developer/odo.git synced 2025-10-19 03:06:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Run devfile docker url tests without kube config (#3223)

Browse Source 
* Run devfile docker url tests without kube config

Signed-off-by: John Collier <John.J.Collier@ibm.com>

* Update target

Signed-off-by: John Collier <John.J.Collier@ibm.com>

* Fix typo

Signed-off-by: John Collier <John.J.Collier@ibm.com>
This commit is contained in:
John Collier
2020-05-21 09:18:23 -04:00
committed by GitHub
parent b061f34340
commit 8aa1a4b953
4 changed files with 89 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -135,7 +135,7 @@ jobs:
- ./scripts/oc-cluster.sh
- make bin
- sudo cp odo /usr/bin
- travis_wait make test-cmd-docker-devfile-url
- travis_wait make test-cmd-docker-devfile-url-pushtarget
# These tests need cluster login as they will be interacting with a Kube environment
- odo login -u developer
- travis_wait make test-cmd-devfile-catalog
@@ -169,6 +169,7 @@ jobs:
- travis_wait make test-cmd-docker-devfile-push
- travis_wait make test-cmd-docker-devfile-catalog
- travis_wait make test-cmd-docker-devfile-delete
- travis_wait make test-cmd-docker-devfile-url
# Run devfile integration test on Kubernetes cluster
- <<: *base-test

5
Makefile
View File

@@ -258,6 +258,11 @@ test-cmd-docker-devfile-delete:
test-cmd-docker-devfile-catalog:
ginkgo $(GINKGO_FLAGS) -focus="odo docker devfile catalog command tests" tests/integration/devfile/docker/
# Run odo url docker devfile command tests
.PHONY: test-cmd-docker-devfile-url-pushtarget
test-cmd-docker-devfile-url-pushtarget:
ginkgo $(GINKGO_FLAGS) -focus="odo docker devfile url pushtarget command tests" tests/integration/devfile/docker/
# Run odo watch command tests
.PHONY: test-cmd-watch
test-cmd-watch:

82
tests/integration/devfile/docker/cmd_docker_devfile_url_pushtarget_test.go Normal file
View File

@@ -0,0 +1,82 @@
package docker
import (
"os"
"path/filepath"
"time"
"github.com/openshift/odo/tests/helper"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
var _ = Describe("odo docker devfile url pushtarget command tests", func() {
var context, currentWorkingDirectory, cmpName string
dockerClient := helper.NewDockerRunner("docker")
// This is run after every Spec (It)
var _ = BeforeEach(func() {
SetDefaultEventuallyTimeout(10 * time.Minute)
context = helper.CreateNewContext()
currentWorkingDirectory = helper.Getwd()
cmpName = helper.RandString(6)
helper.Chdir(context)
os.Setenv("GLOBALODOCONFIG", filepath.Join(context, "config.yaml"))
helper.CmdShouldPass("odo", "preference", "set", "Experimental", "true")
helper.CmdShouldPass("odo", "preference", "set", "pushtarget", "docker")
})
// Clean up after the test
// This is run after every Spec (It)
var _ = AfterEach(func() {
// Stop all containers labeled with the component name
label := "component=" + cmpName
dockerClient.StopContainers(label)
helper.Chdir(currentWorkingDirectory)
helper.DeleteDir(context)
os.Unsetenv("GLOBALODOCONFIG")
})
// These tests require an active kube context *and* Docker daemon, so keeping them separate
// from the other Docker URL tests which only require Docker.
Context("Switching pushtarget", func() {
It("switch from docker to kube, odo push should display warning", func() {
var stdout string
helper.CmdShouldPass("odo", "create", "nodejs", cmpName)
helper.CopyExample(filepath.Join("source", "devfiles", "nodejs", "project"), context)
helper.CopyExampleDevFile(filepath.Join("source", "devfiles", "nodejs", "devfile.yaml"), filepath.Join(context, "devfile.yaml"))
helper.CmdShouldPass("odo", "url", "create")
helper.CmdShouldPass("odo", "preference", "set", "pushtarget", "kube", "-f")
session := helper.CmdRunner("odo", "push", "--devfile", "devfile.yaml")
stdout = string(session.Wait().Out.Contents())
stderr := string(session.Wait().Err.Contents())
Expect(stderr).To(ContainSubstring("Found a URL defined for Docker, but no valid URLs for Kubernetes."))
Expect(stdout).To(ContainSubstring("Changes successfully pushed to component"))
})
It("switch from kube to docker, odo push should display warning", func() {
var stdout string
helper.CmdShouldPass("odo", "preference", "set", "pushtarget", "kube", "-f")
helper.CmdShouldPass("odo", "create", "nodejs", cmpName)
helper.CopyExample(filepath.Join("source", "devfiles", "nodejs", "project"), context)
helper.CopyExampleDevFile(filepath.Join("source", "devfiles", "nodejs", "devfile.yaml"), filepath.Join(context, "devfile.yaml"))
helper.CmdShouldPass("odo", "url", "create", "--host", "1.2.3.4.com", "--ingress")
helper.CmdShouldPass("odo", "preference", "set", "pushtarget", "docker", "-f")
session := helper.CmdRunner("odo", "push", "--devfile", "devfile.yaml")
stdout = string(session.Wait().Out.Contents())
stderr := string(session.Wait().Err.Contents())
Expect(stderr).To(ContainSubstring("Found a URL defined for Kubernetes, but no valid URLs for Docker."))
Expect(stdout).To(ContainSubstring("Changes successfully pushed to component"))
})
})
})

38
tests/integration/devfile/docker/cmd_docker_devfile_url_test.go
View File

@@ -103,44 +103,6 @@ var _ = Describe("odo docker devfile url command tests", func() {
})
})
Context("Switching pushtarget", func() {
It("switch from docker to kube, odo push should display warning", func() {
var stdout string
helper.CmdShouldPass("odo", "create", "nodejs", cmpName)
helper.CopyExample(filepath.Join("source", "devfiles", "nodejs", "project"), context)
helper.CopyExampleDevFile(filepath.Join("source", "devfiles", "nodejs", "devfile.yaml"), filepath.Join(context, "devfile.yaml"))
helper.CmdShouldPass("odo", "url", "create")
helper.CmdShouldPass("odo", "preference", "set", "pushtarget", "kube", "-f")
session := helper.CmdRunner("odo", "push", "--devfile", "devfile.yaml")
stdout = string(session.Wait().Out.Contents())
stderr := string(session.Wait().Err.Contents())
Expect(stderr).To(ContainSubstring("Found a URL defined for Docker, but no valid URLs for Kubernetes."))
Expect(stdout).To(ContainSubstring("Changes successfully pushed to component"))
})
It("switch from kube to docker, odo push should display warning", func() {
var stdout string
helper.CmdShouldPass("odo", "preference", "set", "pushtarget", "kube", "-f")
helper.CmdShouldPass("odo", "create", "nodejs", cmpName)
helper.CopyExample(filepath.Join("source", "devfiles", "nodejs", "project"), context)
helper.CopyExampleDevFile(filepath.Join("source", "devfiles", "nodejs", "devfile.yaml"), filepath.Join(context, "devfile.yaml"))
helper.CmdShouldPass("odo", "url", "create", "--host", "1.2.3.4.com", "--ingress")
helper.CmdShouldPass("odo", "preference", "set", "pushtarget", "docker", "-f")
session := helper.CmdRunner("odo", "push", "--devfile", "devfile.yaml")
stdout = string(session.Wait().Out.Contents())
stderr := string(session.Wait().Err.Contents())
Expect(stderr).To(ContainSubstring("Found a URL defined for Kubernetes, but no valid URLs for Docker."))
Expect(stdout).To(ContainSubstring("Changes successfully pushed to component"))
})
})
Context("Listing urls", func() {
It("should list url with appropriate state", func() {
var stdout string