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 2747bc94f9a55c6b9549fa153f74aec8fd0b06bb..e302e026f01a5ad0935ae6a9a5a367d520cbc243 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" diff --git a/testcases/cli-test/fastdfs/common/common_lib.sh b/testcases/cli-test/fastdfs/common/common_lib.sh index 7313567f37b47263f85159c9a6d228c7651967f1..4a7ea7af4ccf1e9c227da44750f9458a351fb786 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 diff --git a/testcases/cli-test/swaplabel/oe_test_swaplabel.sh b/testcases/cli-test/swaplabel/oe_test_swaplabel.sh index 37ed48730d09d963ce770b7b6b28d3973554883c..1afe0ad388a1208a927989f0b65dbafa372a6e8d 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"