summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/apiv2/01-basic.at2
-rw-r--r--test/e2e/manifest_test.go19
-rw-r--r--test/system/065-cp.bats4
-rw-r--r--test/system/200-pod.bats2
4 files changed, 10 insertions, 17 deletions
diff --git a/test/apiv2/01-basic.at b/test/apiv2/01-basic.at
index e4348a9a7..c4183eda9 100644
--- a/test/apiv2/01-basic.at
+++ b/test/apiv2/01-basic.at
@@ -21,7 +21,7 @@ for i in /version version; do
.Components[0].Details.APIVersion~4[0-9.-]\\+ \
.Components[0].Details.MinAPIVersion=4.0.0 \
.Components[0].Details.Os=linux \
- .ApiVersion=1.40 \
+ .ApiVersion=1.41 \
.MinAPIVersion=1.24 \
.Os=linux
done
diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go
index 280276973..1f58419a1 100644
--- a/test/e2e/manifest_test.go
+++ b/test/e2e/manifest_test.go
@@ -17,7 +17,6 @@ var _ = Describe("Podman manifest", func() {
tempdir string
err error
podmanTest *PodmanTestIntegration
- registry *podmanRegistry.Registry
)
const (
@@ -40,13 +39,6 @@ var _ = Describe("Podman manifest", func() {
})
AfterEach(func() {
- // if auth test fails, it will leave a registry running
- if registry != nil {
- _ = registry.Stop()
- }
- // Also from auth test; don't propagate it to other tests
- os.Unsetenv("PODMAN")
-
podmanTest.Cleanup()
f := CurrentGinkgoTestDescription()
processTestResult(f)
@@ -312,8 +304,13 @@ var _ = Describe("Podman manifest", func() {
opts = strings.Join(getRemoteOptions(podmanTest, nil), " ")
}
os.Setenv("PODMAN", podmanTest.PodmanBinary+" "+opts)
- registry, err = podmanRegistry.StartWithOptions(registryOptions)
+ registry, err := podmanRegistry.StartWithOptions(registryOptions)
Expect(err).To(BeNil())
+ defer func() {
+ err := registry.Stop()
+ Expect(err).To(BeNil())
+ os.Unsetenv("PODMAN")
+ }()
session := podmanTest.Podman([]string{"manifest", "create", "foo"})
session.WaitWithDefaultTimeout()
@@ -342,10 +339,6 @@ var _ = Describe("Podman manifest", func() {
push = podmanTest.Podman([]string{"manifest", "push", "--tls-verify=false", "--creds=podmantest:wrongpasswd", "foo", "localhost:" + registry.Port + "/credstest"})
push.WaitWithDefaultTimeout()
Expect(push).To(ExitWithError())
-
- err = registry.Stop()
- Expect(err).To(BeNil())
- registry = nil
})
It("push with error", func() {
diff --git a/test/system/065-cp.bats b/test/system/065-cp.bats
index 12c6e1a01..8f5abd228 100644
--- a/test/system/065-cp.bats
+++ b/test/system/065-cp.bats
@@ -66,7 +66,7 @@ load helpers
# Container (parent) path does not exist.
run_podman 125 cp $srcdir/hostfile0 cpcontainer:/IdoNotExist/
- is "$output" 'Error: "/IdoNotExist/" could not be found on container cpcontainer: No such file or directory' \
+ is "$output" 'Error: "/IdoNotExist/" could not be found on container cpcontainer: no such file or directory' \
"copy into nonexistent path in container"
run_podman kill cpcontainer
@@ -794,7 +794,7 @@ ${randomcontent[1]}" "$description"
is "$output" "" "output from podman cp 1"
run_podman 125 cp --pause=false $srcdir/$rand_filename2 cpcontainer:/tmp/d2/x/
- is "$output" 'Error: "/tmp/d2/x/" could not be found on container cpcontainer: No such file or directory' "cp will not create nonexistent destination directory"
+ is "$output" 'Error: "/tmp/d2/x/" could not be found on container cpcontainer: no such file or directory' "cp will not create nonexistent destination directory"
run_podman cp --pause=false $srcdir/$rand_filename3 cpcontainer:/tmp/d3/x
is "$output" "" "output from podman cp 3"
diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats
index 0e522b34d..b93f3f92f 100644
--- a/test/system/200-pod.bats
+++ b/test/system/200-pod.bats
@@ -332,7 +332,7 @@ EOF
@test "podman pod create --share" {
local pod_name="$(random_string 10 | tr A-Z a-z)"
run_podman 125 pod create --share bogus --name $pod_name
- is "$output" ".*Invalid kernel namespace to share: bogus. Options are: cgroup, ipc, net, pid, uts or none" \
+ is "$output" ".*invalid kernel namespace to share: bogus. Options are: cgroup, ipc, net, pid, uts or none" \
"pod test for bogus --share option"
run_podman pod create --share ipc --name $pod_name
run_podman pod inspect $pod_name --format "{{.SharedNamespaces}}"