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

conmon: Add support for partial/newline log tags

Browse source 
This is for ttps://github.com/kubernetes/kubernetes/pull/55922

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2017-11-17 10:58:12 -08:00
parent 63371009ae
commit 4cf4137be0
6 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/ctr.bats
View file

@ -191,8 +191,8 @@ function teardown() {
logpath="$DEFAULT_LOG_PATH/$pod_id/$ctr_id.log"
[ -f "$logpath" ]
echo "$logpath :: $(cat "$logpath")"
grep -E "^[^\n]+ stdout here is some output$" "$logpath"
grep -E "^[^\n]+ stderr and some from stderr$" "$logpath"
grep -E "^[^\n]+ stdout F here is some output$" "$logpath"
grep -E "^[^\n]+ stderr F and some from stderr$" "$logpath"
run crictl stops "$pod_id"
echo "$output"
@ -238,7 +238,7 @@ function teardown() {
logpath="$DEFAULT_LOG_PATH/$pod_id/$ctr_id.log"
[ -f "$logpath" ]
echo "$logpath :: $(cat "$logpath")"
grep --binary -P "^[^\n]+ stdout here is some output\x0d$" "$logpath"
grep --binary -P "^[^\n]+ stdout F here is some output\x0d$" "$logpath"
run crictl stops "$pod_id"
echo "$output"