diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-07-14 18:48:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-14 18:48:41 +0000 |
| commit | 313ec3e2518745147438c28f8461eef6f629eab9 (patch) | |
| tree | a94ff24c29dbcb05159d329bd5ea7fb4d56d1a7e | |
| parent | 3637d55191be2e9a5b9e13f8f62db4c27d188741 (diff) | |
| parent | 3b5034e91a5363d979206865505688aa34900a0c (diff) | |
| download | podman-313ec3e2518745147438c28f8461eef6f629eab9.tar.gz podman-313ec3e2518745147438c28f8461eef6f629eab9.tar.bz2 podman-313ec3e2518745147438c28f8461eef6f629eab9.zip | |
Merge pull request #14938 from nicrowe00/12475remix
fix tests for "podman kube play"
| -rw-r--r-- | test/apiv2/80-kube.at | 24 | ||||
| -rw-r--r-- | test/system/700-play.bats | 16 |
2 files changed, 22 insertions, 18 deletions
diff --git a/test/apiv2/80-kube.at b/test/apiv2/80-kube.at index 40b26d75e..f40a6556e 100644 --- a/test/apiv2/80-kube.at +++ b/test/apiv2/80-kube.at @@ -37,13 +37,29 @@ t DELETE libpod/containers/$cid 200 .[0].Id=$cid # Make sure that kube-play works -t POST libpod/kube/play $YAML 200 -t DELETE libpod/kube/play $YAML 200 +t POST libpod/kube/play $YAML 200 \ + .Pods[0].ID~[0-9a-f]\\{64\\} \ + .Pods[0].ContainerErrors=null \ + .Pods[0].Containers[0]~[0-9a-f]\\{64\\} + +t DELETE libpod/kube/play $YAML 200 \ + .Pods[0].ID~null \ + .Pods[0].ContainerErrors=null \ + .Pods[0].Containers[0]~null # Make sure that play-kube works -t POST libpod/play/kube $YAML 200 -t DELETE libpod/play/kube $YAML 200 +t POST libpod/play/kube $YAML 200 \ + .Pods[0].ID~[0-9a-f]\\{64\\} \ + .Pods[0].ContainerErrors=null \ + .Pods[0].Containers[0]~[0-9a-f]\\{64\\} + +t DELETE libpod/play/kube $YAML 200 \ + .Pods[0].ID~null \ + .Pods[0].ContainerErrors=null \ + .Pods[0].Containers[0]~null \ + .StopReport[0].Id~[0-9a-f]\\{64\\} \ + .RmReport[0].Id~[0-9a-f]\\{64\\} rm -rf $TMPD diff --git a/test/system/700-play.bats b/test/system/700-play.bats index 53e9a5274..72602a9e6 100644 --- a/test/system/700-play.bats +++ b/test/system/700-play.bats @@ -86,21 +86,9 @@ RELABEL="system_u:object_r:container_file_t:s0" run_podman pod rm -t 0 -f test_pod } -@test "podman kube" { - TESTDIR=$PODMAN_TMPDIR/testdir - mkdir -p $TESTDIR - echo "$testYaml" | sed "s|TESTDIR|${TESTDIR}|g" > $PODMAN_TMPDIR/test.yaml - run_podman kube play $PODMAN_TMPDIR/test.yaml - if [ -e /usr/sbin/selinuxenabled -a /usr/sbin/selinuxenabled ]; then - run ls -Zd $TESTDIR - is "$output" "${RELABEL} $TESTDIR" "selinux relabel should have happened" - fi - - run_podman stop -a -t 0 - run_podman pod rm -t 0 -f test_pod -} - @test "podman play" { + # Testing that the "podman play" cmd still works now that + # "podman kube" is an option. TESTDIR=$PODMAN_TMPDIR/testdir mkdir -p $TESTDIR echo "$testYaml" | sed "s|TESTDIR|${TESTDIR}|g" > $PODMAN_TMPDIR/test.yaml |