diff options
author | baude <bbaude@redhat.com> | 2018-02-08 10:40:43 -0600 |
---|---|---|
committer | baude <bbaude@redhat.com> | 2018-02-08 12:37:07 -0600 |
commit | c089cb9c9270aa4b367deb8c8c03cb05f8860a33 (patch) | |
tree | 8d765658f757798e1578fd2fc96f1528e6af5e20 /test/e2e/libpod_suite_test.go | |
parent | 8fdccb77648f5b772c6bae98fce4734b1a54ed4a (diff) | |
download | podman-c089cb9c9270aa4b367deb8c8c03cb05f8860a33.tar.gz podman-c089cb9c9270aa4b367deb8c8c03cb05f8860a33.tar.bz2 podman-c089cb9c9270aa4b367deb8c8c03cb05f8860a33.zip |
Final ginkgo migration
Completion of the migration from bats to ginkgo. This includes:
* load
* mount
* pause
* port
* run_networking
* search
Note: build will be done within a different PR
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'test/e2e/libpod_suite_test.go')
-rw-r--r-- | test/e2e/libpod_suite_test.go | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index d6263beb2..e6f110dad 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -39,11 +39,12 @@ var ( INTEGRATION_ROOT string STORAGE_OPTIONS = "--storage-driver vfs" ARTIFACT_DIR = "/tmp/.artifacts" - CACHE_IMAGES = []string{"alpine", "busybox", fedoraMinimal} + CACHE_IMAGES = []string{"alpine", "busybox", fedoraMinimal, nginx} RESTORE_IMAGES = []string{"alpine", "busybox"} ALPINE = "docker.io/library/alpine:latest" BB_GLIBC = "docker.io/library/busybox:glibc" fedoraMinimal = "registry.fedoraproject.org/fedora-minimal:latest" + nginx = "docker.io/library/nginx:latest" defaultWaitTimeout = 90 ) @@ -427,3 +428,14 @@ func (s *PodmanSession) LineInOuputStartsWith(term string) bool { } return false } + +//LineInOutputContains returns true if a line in a +// session output starts with the supplied string +func (s *PodmanSession) LineInOuputContains(term string) bool { + for _, i := range s.OutputToStringArray() { + if strings.Contains(i, term) { + return true + } + } + return false +} |