适配HuiLuChongFa

zengln · Sep 1, 2021 · 0f466e7 · 0f466e7
1 parent dafec9a
commit 0f466e7
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/Jmeter2Blade/adapter/znlyAdapter.py b/Jmeter2Blade/adapter/znlyAdapter.py
@@ -310,6 +310,7 @@ def deal_csv_threadgroup(root):
 
         if sub_element.tag == "BeanShellPreProcessor":
             script = sub_element.element.find(".//stringProp[@name='script']").text
+            logger.debug(re.findall(r'new FileInputStream\(vars.get\("(.*?)"\)\);', script))
             csv_file = re.findall(r'new FileInputStream\(vars.get\("(.*?)"\)\);', script)[0]
             csv_file_path = arguments_local.get(csv_file)
             csv_file_name = os.path.split(csv_file_path)[-1]
@@ -492,14 +493,18 @@ def deal_threadgroup(root, node_path):
         elif sub_element.tag == "HTTPSamplerProxy" and "正例" in sub_element.get("testname"):
             thread_group_cases = True
             break
+        elif sub_element.tag == "CounterConfig":
+            # 有计数器,也是一种读取csv的情况
+            csv_flag = True
+            break
 
     if csv_flag:
         for sub_element in sub_elements:
             if not sub_element.isEnabled():
                 continue
 
-            if sub_element.tag == "IfController":
-                root = sub_element
+            # if sub_element.tag == "IfController":
+            #     root = sub_element
 
         cases = deal_csv_threadgroup(root)
         for case in cases:
@@ -561,7 +566,7 @@ def deal_threadgroup(root, node_path):
 
 # 本地数据库名称与blade数据库名称映射
 data_sources = {
-    "HS0001": "smart_route_jmeter_oracle"
+    "bupps": "smart_route_jmeter_oracle"
 }
 
 check_msg_head = "bupps_resp_head_"
@@ -574,7 +579,7 @@ def deal_threadgroup(root, node_path):
 
 JMX_DIR = Path(__file__).resolve().parent.parent
 
-file_path = JMX_DIR / "file/智能路由/Auto-HeXinDuiZhang.jmx"
+file_path = JMX_DIR / "file/智能路由/Auto-HuiLuChongFa.jmx"
 
 # 读取xml文件
 tree = ET.parse(file_path)