diff options
Diffstat (limited to '0014-adapt-new-error-message-for-isula-cp.patch')
| -rw-r--r-- | 0014-adapt-new-error-message-for-isula-cp.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/0014-adapt-new-error-message-for-isula-cp.patch b/0014-adapt-new-error-message-for-isula-cp.patch new file mode 100644 index 0000000..f6b01d6 --- /dev/null +++ b/0014-adapt-new-error-message-for-isula-cp.patch @@ -0,0 +1,43 @@ +From aba6d26fe34b3bea5964bca25f081a240312f08b Mon Sep 17 00:00:00 2001 +From: haozi007 <liuhao27@huawei.com> +Date: Thu, 7 Sep 2023 14:41:48 +0800 +Subject: [PATCH 14/33] adapt new error message for isula cp + +Signed-off-by: haozi007 <liuhao27@huawei.com> +--- + CI/test_cases/container_cases/cp.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CI/test_cases/container_cases/cp.sh b/CI/test_cases/container_cases/cp.sh +index 7bec9170..e60ccbc2 100755 +--- a/CI/test_cases/container_cases/cp.sh ++++ b/CI/test_cases/container_cases/cp.sh +@@ -57,10 +57,10 @@ test_cp_file_from_container() + fi + rm -rf $dstfile + +- isula cp $containername:/etc/../etc/passwd/ $cpfiles 2>&1 | grep "Not a directory" ++ isula cp $containername:/etc/../etc/passwd/ $cpfiles 2>&1 | grep "get more information from log" + [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to do copy" && ((ret++)) + +- isula cp $containername:/etc/nonexists $cpfiles 2>&1 | grep "No such file or directory" ++ isula cp $containername:/etc/nonexists $cpfiles 2>&1 | grep "get more information from log" + [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to do copy" && ((ret++)) + + dstfile=$cpfiles/etc +@@ -146,10 +146,10 @@ test_cp_file_to_container() + isula cp /etc/passwd $containername:$cpfiles/nonexists/ 2>&1 | grep "no such directory" + [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to do copy" && ((ret++)) + +- isula cp /etc/passwd $containername:$cpfiles/nonexists/nonexists 2>&1 | grep "No such file or directory" ++ isula cp /etc/passwd $containername:$cpfiles/nonexists/nonexists 2>&1 | grep "get more information from log" + [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to do copy" && ((ret++)) + +- isula cp /etc/nonexists $containername:$cpfiles 2>&1 | grep "No such file or directory" ++ isula cp /etc/nonexists $containername:$cpfiles 2>&1 | grep "get more information from log" + [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to do copy" && ((ret++)) + rm -rf $dstfile + +-- +2.40.1 + |