summaryrefslogtreecommitdiff
path: root/0006-fix-inspect.sh-failed.patch
blob: 17f55107c4e97c7692b36307ce0e05e98b9a4602 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
From e4993d0e89ca853d74d8b23895de0967b4379441 Mon Sep 17 00:00:00 2001
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
Date: Mon, 13 Feb 2023 17:42:30 +0800
Subject: [PATCH 06/53] fix inspect.sh failed

Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
---
 CI/test_cases/container_cases/inspect.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/CI/test_cases/container_cases/inspect.sh b/CI/test_cases/container_cases/inspect.sh
index 0d4ccb02..cde9ea1f 100755
--- a/CI/test_cases/container_cases/inspect.sh
+++ b/CI/test_cases/container_cases/inspect.sh
@@ -103,12 +103,7 @@ function test_inspect_spec()
     isula inspect --format='{{.Image}}' $containername 2>&1 | grep "sha256:${image_id}"
     [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to check container with image: ${image}" && ((ret++))
 
-    if [ -d /sys/fs/cgroup/files ];then
-        grepval="100"
-    else
-        grepval="0"
-    fi
-    isula inspect --format='{{json .HostConfig.FilesLimit}}' $containername 2>&1 | grep "$grepval"
+    isula inspect --format='{{json .HostConfig.FilesLimit}}' $containername 2>&1 | grep 0
     [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to check container with image: ${image}" && ((ret++))
 
     isula inspect --format='{{json .Config.Env}}' $containername 2>&1 | grep "a=1"
-- 
2.25.1