From b662bfd34c10e0afd2631353a80ed0ac7b3069c4 Mon Sep 17 00:00:00 2001 From: baijing_0022 <799286817@qq.com> Date: Mon, 6 Jan 2025 09:28:50 +0000 Subject: [PATCH 1/3] =?UTF-8?q?update=20testcases/cli-test/swaplabel/oe=5F?= =?UTF-8?q?test=5Fswaplabel.sh.=20=E4=BF=AE=E6=94=B9swaplabel=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E8=BE=93=E5=87=BA=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: baijing_0022 <799286817@qq.com> --- testcases/cli-test/swaplabel/oe_test_swaplabel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/cli-test/swaplabel/oe_test_swaplabel.sh b/testcases/cli-test/swaplabel/oe_test_swaplabel.sh index 37ed48730..1afe0ad38 100644 --- a/testcases/cli-test/swaplabel/oe_test_swaplabel.sh +++ b/testcases/cli-test/swaplabel/oe_test_swaplabel.sh @@ -27,7 +27,7 @@ function pre_test() { function run_test() { LOG_INFO "Start testing..." - swaplabel "$swap" |grep "LABEL: SWAP" + swaplabel "$swap" |grep "UUID" CHECK_RESULT $? 0 0 "Failed to display the label of SWAP partition" swapoff "$swap" swaplabel -L SWAP1 "$swap" -- Gitee From b0dc3043a877f9ab255b856bd7c692fda97ef942 Mon Sep 17 00:00:00 2001 From: baijing_0022 <799286817@qq.com> Date: Tue, 7 Jan 2025 08:17:02 +0000 Subject: [PATCH 2/3] =?UTF-8?q?update=20testcases/cli-test/elinks/oe=5Ftes?= =?UTF-8?q?t=5Felinks=5Fbase=5F02.sh.=20=E7=BD=91=E9=A1=B5=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E6=9C=89=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: baijing_0022 <799286817@qq.com> --- testcases/cli-test/elinks/oe_test_elinks_base_02.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testcases/cli-test/elinks/oe_test_elinks_base_02.sh b/testcases/cli-test/elinks/oe_test_elinks_base_02.sh index 2747bc94f..e302e026f 100644 --- a/testcases/cli-test/elinks/oe_test_elinks_base_02.sh +++ b/testcases/cli-test/elinks/oe_test_elinks_base_02.sh @@ -22,6 +22,7 @@ source ${OET_PATH}/libs/locallibs/common_lib.sh function pre_test() { LOG_INFO "Start environmental preparation." DNF_INSTALL elinks + SLEEP_WAIT 5 echo > text LOG_INFO "End of environmental preparation!" } @@ -29,7 +30,7 @@ function pre_test() { function run_test() { LOG_INFO "Start to run test." - elinks -dump text -dump-color-mode 1 www.baidu.com | grep "http://zhidao.baidu.com" + elinks -dump text -dump-color-mode 1 www.baidu.com | grep "https://zhidao.baidu.com" CHECK_RESULT $? 0 0 "Check elinks -dump -dump-color-mode failed" elinks -dump text -dump-width 1 www.baidu.com | grep "http://wenku.baidu.com" -- Gitee From e593a29d5db31aaa9ec23339a6b86d586a44101a Mon Sep 17 00:00:00 2001 From: baijing_0022 <799286817@qq.com> Date: Tue, 7 Jan 2025 09:15:07 +0000 Subject: [PATCH 3/3] =?UTF-8?q?update=20testcases/cli-test/fastdfs/common/?= =?UTF-8?q?common=5Flib.sh.=20=E9=83=A8=E5=88=86=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: baijing_0022 <799286817@qq.com> --- testcases/cli-test/fastdfs/common/common_lib.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testcases/cli-test/fastdfs/common/common_lib.sh b/testcases/cli-test/fastdfs/common/common_lib.sh index 7313567f3..4a7ea7af4 100644 --- a/testcases/cli-test/fastdfs/common/common_lib.sh +++ b/testcases/cli-test/fastdfs/common/common_lib.sh @@ -18,18 +18,18 @@ source "${OET_PATH}/libs/locallibs/common_lib.sh" function Pre_Test() { - DNF_INSTALL "fastdfs* libfdfsclient net-tools" + DNF_INSTALL fastdfs* libfdfsclient net-tools cp /etc/fdfs/client.conf ./client.conf cp /etc/fdfs/storage.conf ./storage.conf cp /etc/fdfs/tracker.conf ./tracker.conf mkdir -p /tmp/guochenyang/1 /tmp/guochenyang/2 /tmp/guochenyang/3 - sed -i '/base_path/s/\/home\/yuqing\/fastdfs/\/tmp\/guochenyang\/1/g' ./client.conf + sed -i '/base_path/s/\/opt\/fastdfs/\/tmp\/guochenyang\/1/g' ./client.conf sed -i '/tracker_server =/d' ./client.conf sed -i "21atracker_server =${NODE1_IPV4}" ./client.conf - sed -i '/base_path/s/\/home\/yuqing\/fastdfs/\/tmp\/guochenyang\/2/g' ./tracker.conf + sed -i '/base_path/s/\/opt\/fastdfs/\/tmp\/guochenyang\/2/g' ./tracker.conf sed -i '/thread_stack_size/s/256KB/1024KB/g' ./tracker.conf - sed -i '/base_path/s/\/home\/yuqing\/fastdfs/\/tmp\/guochenyang\/3/g' ./storage.conf - sed -i '/store_path0/s/\/home\/yuqing\/fastdfs/\/tmp\/guochenyang\/3/g' ./storage.conf + sed -i '/base_path/s/\/opt\/fastdfs/\/tmp\/guochenyang\/3/g' ./storage.conf + sed -i '/store_path0/s/\/opt\/fastdfs/\/tmp\/guochenyang\/3/g' ./storage.conf sed -i '/tracker_server =/d' ./storage.conf sed -i "144atracker_server =${NODE1_IPV4}" ./storage.conf echo "hello" >./test1.txt -- Gitee