summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2017-11-27 17:11:22 -0500
committerGitHub <noreply@github.com>2017-11-27 17:11:22 -0500
commit55167ef9828045f8f998286ffa76cad13c4c7da1 (patch)
tree3ff9100036e14cd07e1849baaf9da80e65b0c9bc /test
parent52ea0deee64c7466635452c62354604bdc7b48b4 (diff)
parent7c2a75335f59847a5ffa3252d0fd47bdee265e7d (diff)
downloadpodman-55167ef9828045f8f998286ffa76cad13c4c7da1.tar.gz
podman-55167ef9828045f8f998286ffa76cad13c4c7da1.tar.bz2
podman-55167ef9828045f8f998286ffa76cad13c4c7da1.zip
Merge pull request #79 from mheon/fix_create
Make 'kpod create' also create the container in runc
Diffstat (limited to 'test')
-rw-r--r--test/kpod_create.bats2
-rw-r--r--test/kpod_pause.bats5
2 files changed, 6 insertions, 1 deletions
diff --git a/test/kpod_create.bats b/test/kpod_create.bats
index 3d3efcff3..5605b5fe0 100644
--- a/test/kpod_create.bats
+++ b/test/kpod_create.bats
@@ -11,12 +11,14 @@ function teardown() {
}
@test "create a container based on local image" {
+ skip "Reenable after kpod rm merges, and use rm to clean up"
run ${KPOD_BINARY} ${KPOD_OPTIONS} create $BB ls
echo "$output"
[ "$status" -eq 0 ]
}
@test "create a container based on a remote image" {
+ skip "Reenable after kpod rm merges, and use rm to clean up"
run ${KPOD_BINARY} ${KPOD_OPTIONS} create ${BB_GLIBC} ls
echo "$output"
[ "$status" -eq 0 ]
diff --git a/test/kpod_pause.bats b/test/kpod_pause.bats
index 23c27ae71..3d6ab7b91 100644
--- a/test/kpod_pause.bats
+++ b/test/kpod_pause.bats
@@ -29,7 +29,10 @@ function teardown() {
ctr_id="$output"
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} pause $ctr_id"
echo "$output"
- [ "$status" -eq 1 ]
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} unpause $ctr_id"
+ echo "$output"
+ [ "$status" -eq 0 ]
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm $ctr_id"
echo "$output"
[ "$status" -eq 0 ]