vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactor common variables in kpod tests

Browse source 
Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude 2017-09-20 18:44:58 -05:00
parent 7e3d0c652d
commit af692f611d
14 changed files with 3 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/helpers.bash
View file

@ -60,6 +60,9 @@ PIDS_LIMIT=${PIDS_LIMIT:-1024}
LOG_SIZE_MAX_LIMIT=${LOG_SIZE_MAX_LIMIT:--1} LOG_SIZE_MAX_LIMIT=${LOG_SIZE_MAX_LIMIT:--1}
TESTDIR=$(mktemp -d) TESTDIR=$(mktemp -d)
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT ${STORAGE_OPTS} --runtime ${RUNTIME_BINARY}"
# kpod pull needs a configuration file for shortname pulls # kpod pull needs a configuration file for shortname pulls
export REGISTRIES_CONFIG_PATH="$INTEGRATION_ROOT/registries.conf" export REGISTRIES_CONFIG_PATH="$INTEGRATION_ROOT/registries.conf"

3
test/kpod.bats
View file

@ -3,9 +3,6 @@
load helpers load helpers
IMAGE="alpine:latest" IMAGE="alpine:latest"
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT --storage-driver vfs"
function teardown() { function teardown() {
cleanup_test cleanup_test

3
test/kpod_diff.bats
View file

@ -3,9 +3,6 @@
load helpers load helpers
IMAGE="alpine:latest" IMAGE="alpine:latest"
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT $STORAGE_OPTS"
function teardown() { function teardown() {
cleanup_test cleanup_test

4
test/kpod_export.bats
View file

@ -3,10 +3,6 @@
load helpers load helpers
IMAGE="redis:alpine" IMAGE="redis:alpine"
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT ${STORAGE_OPTS}"
@test "kpod export output flag" { @test "kpod export output flag" {
start_crio start_crio

3
test/kpod_load.bats
View file

@ -3,9 +3,6 @@
load helpers load helpers
IMAGE="alpine:latest" IMAGE="alpine:latest"
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT $STORAGE_OPTS"
function teardown() { function teardown() {
cleanup_test cleanup_test

3
test/kpod_logs.bats
View file

@ -3,9 +3,6 @@
load helpers load helpers
IMAGE="alpine:latest" IMAGE="alpine:latest"
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT ${STORAGE_OPTS}"
function teardown() { function teardown() {
cleanup_test cleanup_test

3
test/kpod_mount.bats
View file

@ -7,9 +7,6 @@ function teardown() {
load helpers load helpers
IMAGE="redis:alpine" IMAGE="redis:alpine"
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT ${STORAGE_OPTS}"
@test "mount" { @test "mount" {
start_crio start_crio

3
test/kpod_ps.bats
View file

@ -3,9 +3,6 @@
load helpers load helpers
IMAGE="redis:alpine" IMAGE="redis:alpine"
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT ${STORAGE_OPTS}"
@test "kpod ps with no containers" { @test "kpod ps with no containers" {
run ${KPOD_BINARY} ${KPOD_OPTIONS} ps run ${KPOD_BINARY} ${KPOD_OPTIONS} ps

3
test/kpod_pull.bats
View file

@ -3,9 +3,6 @@
load helpers load helpers
IMAGE="alpine:latest" IMAGE="alpine:latest"
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT ${STORAGE_OPTS}"
function teardown() { function teardown() {
cleanup_test cleanup_test

3
test/kpod_rename.bats
View file

@ -3,9 +3,6 @@
load helpers load helpers
IMAGE="redis:alpine" IMAGE="redis:alpine"
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT $STORAGE_OPTS"
NEW_NAME="rename-test" NEW_NAME="rename-test"
function teardown() { function teardown() {

3
test/kpod_rm.bats
View file

@ -3,9 +3,6 @@
load helpers load helpers
IMAGE="alpine:latest" IMAGE="alpine:latest"
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT $STORAGE_OPTS --runtime $RUNTIME_BINARY"
function teardown() { function teardown() {
cleanup_test cleanup_test
} }

3
test/kpod_save.bats
View file

@ -3,9 +3,6 @@
load helpers load helpers
IMAGE="alpine:latest" IMAGE="alpine:latest"
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT $STORAGE_OPTS"
function teardown() { function teardown() {
cleanup_test cleanup_test

3
test/kpod_stats.bats
View file

@ -2,9 +2,6 @@
load helpers load helpers
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT $STORAGE_OPTS"
function teardown() { function teardown() {
cleanup_test cleanup_test

3
test/kpod_stop.bats
View file

@ -2,9 +2,6 @@
load helpers load helpers
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT --storage-driver vfs"
function teardown() { function teardown() {
cleanup_test cleanup_test
} }