From de79268a37b25aeafa098c902f7aec50f58f41c5 Mon Sep 17 00:00:00 2001 From: Ke Zhiming Date: Tue, 5 Jan 2021 20:17:00 +0800 Subject: [PATCH 1/3] virttest: indent adjustment Indent adjustment Signed-off-by: Ke Zhiming --- tests/virttest | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/virttest b/tests/virttest index 7911876..a3576ef 100755 --- a/tests/virttest +++ b/tests/virttest @@ -125,23 +125,23 @@ tear_down() { images_download() { if [ "$arch" = "aarch64" ];then - images=${images_aarch64[@]} + images=${images_aarch64[@]} else - images=${images_x86_64[@]} + images=${images_x86_64[@]} fi for image in ${images[@]};do - if [ ! -f $images_path/$image.succ ]; then + if [ ! -f $images_path/$image.succ ]; then + wget $file_server/$image -O $images_path/$image + wget $file_server/$image.succ -O $images_path/$image.succ + else + wget $file_server/$image.succ -O $images_path/tmp.succ + diff $images_path/tmp.succ $images_path/$image.succ + if [ $? -ne 0 ]; then wget $file_server/$image -O $images_path/$image wget $file_server/$image.succ -O $images_path/$image.succ - else - wget $file_server/$image.succ -O $images_path/tmp.succ - diff $images_path/tmp.succ $images_path/$image.succ - if [ $? -ne 0 ]; then - wget $file_server/$image -O $images_path/$image - wget $file_server/$image.succ -O $images_path/$image.succ - fi fi + fi done } -- Gitee From 01f9997d2b0b5ce18332a33cad717cde5daa723a Mon Sep 17 00:00:00 2001 From: Ke Zhiming Date: Tue, 5 Jan 2021 20:20:57 +0800 Subject: [PATCH 2/3] virttest: wget with -dq Wget with -dq when download_image, --debug and --quiet Signed-off-by: Ke Zhiming --- tests/virttest | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/virttest b/tests/virttest index a3576ef..e1978f5 100755 --- a/tests/virttest +++ b/tests/virttest @@ -132,14 +132,14 @@ images_download() { for image in ${images[@]};do if [ ! -f $images_path/$image.succ ]; then - wget $file_server/$image -O $images_path/$image - wget $file_server/$image.succ -O $images_path/$image.succ + wget -dq $file_server/$image -O $images_path/$image + wget -dq $file_server/$image.succ -O $images_path/$image.succ else - wget $file_server/$image.succ -O $images_path/tmp.succ + wget -dq $file_server/$image.succ -O $images_path/tmp.succ diff $images_path/tmp.succ $images_path/$image.succ if [ $? -ne 0 ]; then - wget $file_server/$image -O $images_path/$image - wget $file_server/$image.succ -O $images_path/$image.succ + wget -dq $file_server/$image -O $images_path/$image + wget -dq $file_server/$image.succ -O $images_path/$image.succ fi fi done -- Gitee From 1dca27d9edc7f63a9814a7f09e4a33705ed2d3c9 Mon Sep 17 00:00:00 2001 From: Ke Zhiming Date: Tue, 5 Jan 2021 20:26:41 +0800 Subject: [PATCH 3/3] virttest: remove images.backup when download_image Delete images.backup before downloading the new image to prevent the updated image from being overwritten by the old backup file. Signed-off-by: Ke Zhiming --- tests/virttest | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/virttest b/tests/virttest index e1978f5..8fa6034 100755 --- a/tests/virttest +++ b/tests/virttest @@ -138,6 +138,7 @@ images_download() { wget -dq $file_server/$image.succ -O $images_path/tmp.succ diff $images_path/tmp.succ $images_path/$image.succ if [ $? -ne 0 ]; then + rm -rf $images_path/$image.backup wget -dq $file_server/$image -O $images_path/$image wget -dq $file_server/$image.succ -O $images_path/$image.succ fi -- Gitee