aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-07 16:11:07 -0400
committerGitHub <noreply@github.com>2020-10-07 16:11:07 -0400
commit59b5f0ac32ddf615fada021bc62c823bb73233da (patch)
treec0f37b51b4c178f23a263d2aa293b5cc554eb4ce /test
parent0e1d01103e45430693736dac10be13c49cf23f03 (diff)
parentb490905f26bcbdd23c0c431482604ad563ea7948 (diff)
downloadpodman-59b5f0ac32ddf615fada021bc62c823bb73233da.tar.gz
podman-59b5f0ac32ddf615fada021bc62c823bb73233da.tar.bz2
podman-59b5f0ac32ddf615fada021bc62c823bb73233da.zip
Merge pull request #7932 from jwhonce/jira/run-898
Restore V1 --format "table..." support
Diffstat (limited to 'test')
-rw-r--r--test/e2e/search_test.go6
-rw-r--r--test/system/060-mount.bats2
2 files changed, 4 insertions, 4 deletions
diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go
index 497949bbc..043da9059 100644
--- a/test/e2e/search_test.go
+++ b/test/e2e/search_test.go
@@ -237,7 +237,7 @@ registries = ['{{.Host}}:{{.Port}}']`
})
It("podman search attempts HTTP if registry is in registries.insecure and force secure is false", func() {
- SkipIfRemote("--tls-verify is not supportedon podman-remote search")
+ SkipIfRemote("--tls-verify is not supported on podman-remote search")
if podmanTest.Host.Arch == "ppc64le" {
Skip("No registry image for ppc64le")
}
@@ -278,7 +278,7 @@ registries = ['{{.Host}}:{{.Port}}']`
})
It("podman search doesn't attempt HTTP if force secure is true", func() {
- SkipIfRemote("--tls-verify is not supportedon podman-remote search")
+ SkipIfRemote("--tls-verify is not supported on podman-remote search")
if podmanTest.Host.Arch == "ppc64le" {
Skip("No registry image for ppc64le")
}
@@ -317,7 +317,7 @@ registries = ['{{.Host}}:{{.Port}}']`
})
It("podman search doesn't attempt HTTP if registry is not listed as insecure", func() {
- SkipIfRemote("--tls-verify is not supportedon podman-remote search")
+ SkipIfRemote("--tls-verify is not supported on podman-remote search")
if podmanTest.Host.Arch == "ppc64le" {
Skip("No registry image for ppc64le")
}
diff --git a/test/system/060-mount.bats b/test/system/060-mount.bats
index 75c88e4ad..f11aff773 100644
--- a/test/system/060-mount.bats
+++ b/test/system/060-mount.bats
@@ -56,7 +56,7 @@ load helpers
# 'image mount', no args, tells us what's mounted
run_podman image mount
- is "$output" "$IMAGE $mount_path" "podman image mount with no args"
+ is "$output" "$IMAGE *$mount_path" "podman image mount with no args"
# Clean up
run_podman image umount $IMAGE