aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorUrvashi Mohnani <umohnani@redhat.com>2017-11-21 12:18:25 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2017-11-22 19:33:13 +0000
commitee4051db61ad8ce6f385ce5be45dcc4b0a29945d (patch)
tree68672ed0247fd43c31447b4d80920b442e0fecc3 /test
parent40dce698d3359a6bf89ed954a483454daf2e9fb2 (diff)
downloadpodman-ee4051db61ad8ce6f385ce5be45dcc4b0a29945d.tar.gz
podman-ee4051db61ad8ce6f385ce5be45dcc4b0a29945d.tar.bz2
podman-ee4051db61ad8ce6f385ce5be45dcc4b0a29945d.zip
Update kpod logs to use the new container state and runtime
Signed-off-by: Urvashi Mohnani <umohnani@redhat.com> Closes: #62 Approved by: rhatdan
Diffstat (limited to 'test')
-rw-r--r--test/kpod_logs.bats51
1 files changed, 11 insertions, 40 deletions
diff --git a/test/kpod_logs.bats b/test/kpod_logs.bats
index 54b1d15c1..d5dc8622e 100644
--- a/test/kpod_logs.bats
+++ b/test/kpod_logs.bats
@@ -2,8 +2,6 @@
load helpers
-IMAGE="alpine:latest"
-
function teardown() {
cleanup_test
}
@@ -13,69 +11,42 @@ function setup() {
}
@test "display logs for container" {
- skip "Test needs to be converted to kpod run"
- start_crio
- run crioctl pod run --config "$TESTDATA"/sandbox_config.json
- echo "$output"
- [ "$status" -eq 0 ]
- pod_id="$output"
- run crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id"
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d $BB ls"
echo "$output"
[ "$status" -eq 0 ]
ctr_id="$output"
- run crioctl ctr start --id "$ctr_id"
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} logs $ctr_id"
echo "$output"
[ "$status" -eq 0 ]
- run bash -c ${KPOD_BINARY} $KPOD_OPTIONS logs "$ctr_id"
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm $ctr_id"
echo "$output"
[ "$status" -eq 0 ]
- cleanup_ctrs
- cleanup_pods
- stop_crio
}
@test "tail three lines of logs for container" {
- skip "Test needs to be converted to kpod run"
- start_crio
- run crioctl pod run --config "$TESTDATA"/sandbox_config.json
- echo "$output"
- [ "$status" -eq 0 ]
- pod_id="$output"
- run crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id"
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d $BB ls"
echo "$output"
[ "$status" -eq 0 ]
ctr_id="$output"
- run crioctl ctr start --id "$ctr_id"
- echo "$output"
- [ "$status" -eq 0 ]
- run bash -c ${KPOD_BINARY} $KPOD_OPTIONS logs --tail 3 $ctr_id
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} logs --tail 3 $ctr_id"
echo "$output"
lines=$(echo "$output" | wc -l)
[ "$status" -eq 0 ]
[[ $(wc -l < "$output" ) -le 3 ]]
- cleanup_ctrs
- cleanup_pods
- stop_crio
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm $ctr_id"
+ echo "$output"
+ [ "$status" -eq 0 ]
}
@test "display logs for container since a given time" {
- skip "Test needs to be converted to kpod run"
- start_crio
- run crioctl pod run --config "$TESTDATA"/sandbox_config.json
- echo "$output"
- [ "$status" -eq 0 ]
- pod_id="$output"
- run crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id"
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d $BB ls"
echo "$output"
[ "$status" -eq 0 ]
ctr_id="$output"
- run crioctl ctr start --id "$ctr_id"
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} logs --since 2017-08-07T10:10:09.056611202-04:00 $ctr_id"
echo "$output"
[ "$status" -eq 0 ]
- run bash -c ${KPOD_BINARY} $KPOD_OPTIONS logs --since 2017-08-07T10:10:09.056611202-04:00 $ctr_id
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm $ctr_id"
echo "$output"
[ "$status" -eq 0 ]
- cleanup_ctrs
- cleanup_pods
- stop_crio
}