From 8cf07b2ad1ed8c6646c48a74e9ecbb2bfeecb322 Mon Sep 17 00:00:00 2001 From: baude Date: Wed, 1 Nov 2017 13:59:11 -0500 Subject: libpod create and run patched version of the same code that went into crio Signed-off-by: baude --- test/helpers.bash | 2 +- test/kpod_create.bats | 24 ++++++++++++++++++++++++ test/kpod_run.bats | 20 ++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 test/kpod_create.bats create mode 100644 test/kpod_run.bats (limited to 'test') diff --git a/test/helpers.bash b/test/helpers.bash index 428336268..dee2193d3 100644 --- a/test/helpers.bash +++ b/test/helpers.bash @@ -90,7 +90,7 @@ CRIO_CNI_PLUGIN=${CRIO_CNI_PLUGIN:-/opt/cni/bin/} POD_CIDR="10.88.0.0/16" POD_CIDR_MASK="10.88.*.*" -KPOD_OPTIONS="--root $TESTDIR/crio $STORAGE_OPTIONS --runroot $TESTDIR/crio-run --runtime ${RUNTIME_BINARY}" +KPOD_OPTIONS="--root $TESTDIR/crio $STORAGE_OPTIONS --runroot $TESTDIR/crio-run --runtime ${RUNTIME_BINARY} --conmon ${CONMON_BINARY}" cp "$CONMON_BINARY" "$TESTDIR/conmon" diff --git a/test/kpod_create.bats b/test/kpod_create.bats new file mode 100644 index 000000000..46a460ecd --- /dev/null +++ b/test/kpod_create.bats @@ -0,0 +1,24 @@ +#!/usr/bin/env bats + +load helpers + +function teardown() { + cleanup_test +} + +ALPINE="docker.io/library/alpine:latest" + +@test "create a container based on local image" { + run ${KPOD_BINARY} ${KPOD_OPTIONS} pull docker.io/library/busybox:latest + echo "$output" + [ "$status" -eq 0 ] + run ${KPOD_BINARY} ${KPOD_OPTIONS} create docker.io/library/busybox:latest ls + echo "$output" + [ "$status" -eq 0 ] +} + +@test "create a container based on a remote image" { + run ${KPOD_BINARY} ${KPOD_OPTIONS} create ${ALPINE} ls + echo "$output" + [ "$status" -eq 0 ] +} diff --git a/test/kpod_run.bats b/test/kpod_run.bats new file mode 100644 index 000000000..4945691a7 --- /dev/null +++ b/test/kpod_run.bats @@ -0,0 +1,20 @@ +#!/usr/bin/env bats + +load helpers + +ALPINE="docker.io/library/alpine:latest" + +@test "run a container based on local image" { + run ${KPOD_BINARY} ${KPOD_OPTIONS} pull docker.io/library/busybox:latest + echo "$output" + [ "$status" -eq 0 ] + run ${KPOD_BINARY} ${KPOD_OPTIONS} run docker.io/library/busybox:latest ls + echo "$output" + [ "$status" -eq 0 ] +} + +@test "run a container based on a remote image" { + run ${KPOD_BINARY} ${KPOD_OPTIONS} run ${ALPINE} ls + echo "$output" + [ "$status" -eq 0 ] +} -- cgit v1.2.3-54-g00ecf