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

Merge pull request #1110 from edsantiago/more_testing_fixes

Browse source 
Various test-scaffolding fixes
This commit is contained in:
Daniel J Walsh 2017-11-10 08:22:06 -05:00 • committed by GitHub
commit e9200aacba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/helpers.bash
View file

@ -286,8 +286,8 @@ function start_crio() {
}
function cleanup_ctrs() {
run crictl ps --quiet
if [ "$status" -eq 0 ]; then
output=$(crictl ps --quiet)
if [ $? -eq 0 ]; then
if [ "$output" != "" ]; then
printf '%s\n' "$output" | while IFS= read -r line
do
@ -300,8 +300,8 @@ function cleanup_ctrs() {
}
function cleanup_images() {
run crictl images --quiet
if [ "$status" -eq 0 ]; then
output=$(crictl images --quiet)
if [ $? -eq 0 ]; then
if [ "$output" != "" ]; then
printf '%s\n' "$output" | while IFS= read -r line
do
@ -312,8 +312,8 @@ function cleanup_images() {
}
function cleanup_pods() {
run crictl sandboxes --quiet
if [ "$status" -eq 0 ]; then
output=$(crictl sandboxes --quiet)
if [ $? -eq 0 ]; then
if [ "$output" != "" ]; then
printf '%s\n' "$output" | while IFS= read -r line
do