Merge pull request #1114 from ryoya-hayase/feature/W2025-28

fix test shells

Author: ryoya-hayase

test/tavern/helper/item_type_mapping/verify_helper.py

@@ -352,6 +352,8 @@ def prepare_data(dic, result_flg=False):
                             result_dict[f"@{attr_key}"] = attr_value
                 elif isinstance(v, dict):
                     result_dict[k.split(':')[-1]] = prepare_data(v, result_flg)
+                else:
+                    result_dict[k.split(':')[-1]] = v
 
         if '#text' in result_dict and len(result_dict) == 1:
             return result_dict['#text']

test/tavern/test/index/index_test.sh

@@ -76,16 +76,16 @@ if [ "$option_cmd" = "select" ]; then
       role_result="$role_result or $line"
     fi
   done
-  if [ -z "$target_result" ] || [ -z "$role_result" ]; then
+  if [ -z "$target_result" ] && [ -z "$role_result" ]; then
     echo "エラー: 対象テストまたは役割テストの指定が不十分です。"
     exit 1
   fi
   if [ -n "$target_result" ] && [ -n "$role_result" ]; then
     pytest_opts="$pytest_opts -m '($target_result) and ($role_result)'"
   elif [ -n "$target_result" ]; then
-    pytest_opts="$pytest_opts -m ('$target_result')"
+    pytest_opts="$pytest_opts -m \"$target_result\""
   elif [ -n "$role_result" ]; then
-    pytest_opts="$pytest_opts -m ('$role_result')"
+    pytest_opts="$pytest_opts -m \"$role_result\""
   fi
 fi
 

test/tavern/test/item_create/item_create_test.sh

@@ -31,7 +31,7 @@ if [ "$option_cmd" = "select" ]; then
     fi
   done
   if [ -n "$target_result" ]; then
-    pytest_opts="$pytest_opts -m ('$target_result')"
+    pytest_opts="$pytest_opts -m \"$target_result\""
   fi
 fi
 

test/tavern/test/item_type_mapping/item_type_mapping_test.sh

@@ -59,16 +59,16 @@ if [ "$option_cmd" = "select" ]; then
       role_result="$role_result or $line"
     fi
   done
-  if [ -z "$target_result" ] || [ -z "$role_result" ]; then
+  if [ -z "$target_result" ] && [ -z "$role_result" ]; then
     echo "エラー: 対象テストまたは役割テストの指定が不十分です。"
     exit 1
   fi
   if [ -n "$target_result" ] && [ -n "$role_result" ]; then
-    pytest_opts="$pytest_opts -m (\"($target_result) and ($role_result)\")"
+    pytest_opts="$pytest_opts -m '($target_result) and ($role_result)'"
   elif [ -n "$target_result" ]; then
-    pytest_opts="$pytest_opts -m (\"$target_result\")"
+    pytest_opts="$pytest_opts -m \"$target_result\""
   elif [ -n "$role_result" ]; then
-    pytest_opts="$pytest_opts -m (\"$role_result\")"
+    pytest_opts="$pytest_opts -m \"$role_result\""
   fi
 fi