image_list: add filter testcases

Signed-off-by: Nlifeng68 <lifeng68@huawei.com>

CI/test_cases/basic_cases/images.bash

-#!/bin/bash
-#
-# attributes: isulad basic image
-# concurrent: NA
-# spend time: 2
-
-curr_path=$(dirname $(readlink -f "$0"))
-data_path=$(realpath $curr_path/../data)
-source ./helpers.bash
-
-INVALID_IMAGE="k~k"
-
-do_test_t()
-{
-  echo "test begin"
-
-  isula pull busybox
-  if [ $? -ne 0 ]; then
-    echo "failed pull image"
-    TC_RET_T=$(($TC_RET_T+1))
-  fi
-
-  isula pull $INVALID_IMAGE
-  if [ $? -eq 0 ];then
-    echo "pull invalid image success"
-    TC_RET_T=$(($TC_RET_T+1))
-  fi
-
-  isula images | grep busybox
-  if [ $? -ne 0 ]; then
-    echo "missing list image busybox"
-    TC_RET_T=$(($TC_RET_T+1))
-  fi
-
-  isula inspect --format='{{json .image.loaded}}' busybox
-  if [ $? -ne 0 ]; then
-    echo "Failed to inspect image busybox loaded time"
-    TC_RET_T=$(($TC_RET_T+1))
-  fi
-
-  isula inspect busybox | grep busybox
-  if [ $? -ne 0 ]; then
-    echo "Failed to inspect image busybox"
-    TC_RET_T=$(($TC_RET_T+1))
-  fi
-
-  echo "test end"
-  return $TC_RET_T
-}
-
-ret=0
-
-do_test_t
-if [ $? -ne 0 ];then
-  let "ret=$ret + 1"
-fi
-
-show_result $ret "images.bash"

CI/test_cases/basic_cases/images_list.bash

+#!/bin/bash
+#
+# attributes: isulad basic image
+# concurrent: NA
+# spend time: 2
+
+#######################################################################
+##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved.
+# - iSulad licensed under the Mulan PSL v2.
+# - You can use this software according to the terms and conditions of the Mulan PSL v2.
+# - You may obtain a copy of Mulan PSL v2 at:
+# -     http://license.coscl.org.cn/MulanPSL2
+# - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+# - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+# - PURPOSE.
+# - See the Mulan PSL v2 for more details.
+##- @Description:CI
+##- @Author: lifeng
+##- @Create: 2020-05-14
+#######################################################################
+
+declare -r curr_path=$(dirname $(readlink -f "$0"))
+source ${curr_path}/helpers.bash
+
+function test_image_list()
+{
+  local ret=0
+  local image="busybox"
+  local INVALID_IMAGE="k~k"
+  local test="list images info test => (${FUNCNAME[@]})"
+
+  msg_info "${test} starting..."
+
+  isula pull ${image}
+  [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to pull image: ${image}" && return ${FAILURE}
+
+  isula pull $INVALID_IMAGE
+  [[ $? -eq 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - sueccess to pull image: ${INVALID_IMAGE}, expect fail" && return ${FAILURE}
+
+  isula images | grep busybox
+  [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - missing list image: ${image}" && ((ret++))
+
+  count=`isula images --filter "reference=*busybox*" | grep busybox | wc -l`
+  [[ $count -ne 1 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - missing list image: ${image} with filter" && ((ret++))
+
+  isula rmi ${image}
+  [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to remove image ${image}" && ((ret++))
+
+  msg_info "${test} finished with return ${ret}..."
+  return ${ret}
+}
+
+declare -i ans=0
+
+test_image_list || ((ans++))
+
+show_result ${ans} "${curr_path}/${0}"
\ No newline at end of file

src/image/oci/oci_common_operators.c

@@ -93,7 +93,6 @@ static int oci_list_all_images(imagetool_images_list *images_list)
     return storage_get_all_images(images_list);
 }
 
-
 static bool image_meet_dangling_filter(const imagetool_image *src, const struct filters_args *filters)
 {
     bool ret = false;