fxing cpu weight tests

Author: Tim Zhou

test/apiv2/20-containers.at

@@ -762,15 +762,12 @@ if root && test -e /dev/nullb0; then
   t POST libpod/containers/updateCtr/update ${TMPD}/update.json 201
 
   cgroupPath=/sys/fs/cgroup/cpu.weight
-  # 002 is the byte length
-  cpu_weight_expect_regex=$'\x01\x025|\x01\x0220'
-
   # Verify CPU weight
   echo '{ "AttachStdout":true,"Cmd":["cat", "'$cgroupPath'"]}' >${TMPD}/exec.json
   t POST containers/updateCtr/exec ${TMPD}/exec.json 201 .Id~[0-9a-f]\\{64\\}
   eid=$(jq -r '.Id' <<<"$output")
   response=$('t POST exec/$eid/start 200')
-  like "$response" "$cpu_weight_expect_regex"
+  like_any "$response" "cpu_weight is 5 or 20" $'\x01\x025' $'\x01\x0220'
 
   BlkioDeviceReadBps_expected='[
   {

test/apiv2/test-apiv2

@@ -737,3 +737,19 @@ fi
 echo "1..${test_count}"
 
 exit $failure_count
+
+
+# LIKE_ANY
+###############################################################################
+like_any() {
+    local actual="$1"
+    local testname="$2"
+    shift 2
+    for expect in "$@"; do
+        if expr "$actual" : "$expect" &>/dev/null; then
+            _show_ok 1 "$testname ('$actual') ~ $expect"
+            return
+        fi
+    done
+    _show_ok 0 "$testname" "~ any of [$*]" "$actual"
+}