diff options
author | Matthew Heon <matthew.heon@gmail.com> | 2018-02-08 14:19:58 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-08 14:19:58 -0500 |
commit | 851bdc325124700448b035057055bd594981030a (patch) | |
tree | 902bea3952683afd6d4c75b210ee7386d49bccba /test/e2e/libpod_suite_test.go | |
parent | 5529143877778ef8bcdd05179e279bb7d662b431 (diff) | |
parent | c089cb9c9270aa4b367deb8c8c03cb05f8860a33 (diff) | |
download | podman-851bdc325124700448b035057055bd594981030a.tar.gz podman-851bdc325124700448b035057055bd594981030a.tar.bz2 podman-851bdc325124700448b035057055bd594981030a.zip |
Merge pull request #314 from baude/ginkgo_last
Final ginkgo migration
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 +} |