smartpush 1.4.3__py3-none-any.whl → 1.4.4__py3-none-any.whl

smartpush/flow/MockFlow.py

@@ -27,7 +27,7 @@ def get_current_flow(host_domain, cookies, flow_id, splits=None, **kwargs):
 
     def process_node(node, split_num=0, index_type="completedCount"):
         # 如当前分支为拆分节点，根据走yes还是no分支取对应字段
-        if "split" == node["type"] and splits is not None:
+        if "split" == node["type"] and splits is not None and len(splits) > split_num:
             index_type = "completedCount" if splits[split_num] == "true" else "skippedCount"
         node_counts.append({node["id"]: {index_type: node["data"][index_type]
                                          }
@@ -39,7 +39,7 @@ def get_current_flow(host_domain, cookies, flow_id, splits=None, **kwargs):
                 "sender": node["data"]["sendLetter"]["sender"],
             }})
         # 处理split节点
-        if "split" == node["type"] and splits is not None:
+        if "split" == node["type"] and splits is not None and len(splits) > split_num:
             split_branch = node['data']['split']['branches'][splits[split_num]]
             split_num += 1
             for branch_node in split_branch:

smartpush/test.py

@@ -13,7 +13,7 @@ from smartpush.export.basic.ReadExcel import read_excel_and_write_to_dict
 from smartpush.export.basic.GetOssUrl import get_oss_address_with_retry
 from smartpush.utils.DataTypeUtils import DataTypeUtils
 from smartpush.flow import MockFlow
-from smartpush.utils import EmailUtlis
+from smartpush.utils import EmailUtlis, ListDictUtils
 
 if __name__ == '__main__':
     # 导出流程
@@ -146,40 +146,46 @@ if __name__ == '__main__':
     #                                   split_node=["true"])
     # print(mock_pulsar)
 
-    old_flow_counts, old_versions, email_contents = MockFlow.get_current_flow(host_domain=host_domain, cookies=cookies,
-                                                                              flow_id="FLOW6966717528141252274",
-                                                                              splits=["false", "true", "true"],
-                                                                              get_email_content=True)
-    print(old_flow_counts, old_versions, email_contents)
-    # mock_pulsar_step1, _ = MockFlow.check_flow(mock_domain=_url, host_domain=host_domain, cookies=cookies,
-    #                                            flow_id="FLOW6966717528141252274", pulsar=params,
-    #                                            split_steps="one", split_node=["true"])
-    # # time.sleep(60)
-    # mock_pulsar_step2, email_contents = MockFlow.check_flow(mock_domain=_url, host_domain=host_domain, cookies=cookies,
-    #                                                         flow_id="FLOW6966717528141252274",
-    #                                                         old_flow_counts=mock_pulsar_step1,
-    #                                                         split_steps="two", split_node=["true"],
-    #                                                         get_email_content=True)
-    # print(mock_pulsar_step1)
-    # print(mock_pulsar_step2)
-    # print(email_contents)
+    # old_flow_counts, old_versions, email_contents = MockFlow.get_current_flow(host_domain=host_domain, cookies=cookies,
+    #                                                                           flow_id="FLOW6966717528141252274",
+    #                                                                           splits=["false", "true", "true"],
+    #                                                                           get_email_content=True)
+    # print(old_flow_counts, old_versions, email_contents)
+    mock_pulsar_step1, _ = MockFlow.check_flow(mock_domain=_url, host_domain=host_domain, cookies=cookies,
+                                               flow_id="FLOW6966717528141252274", pulsar=params,
+                                               split_steps="one", split_node=["false", "true", "true"])
+    print(mock_pulsar_step1)
+    # time.sleep(60)
+    mock_pulsar_step2, email_contents = MockFlow.check_flow(mock_domain=_url, host_domain=host_domain, cookies=cookies,
+                                                            flow_id="FLOW6966717528141252274",
+                                                            old_flow_counts=mock_pulsar_step1,
+                                                            split_steps="two", split_node=["false", "true", "true"],
+                                                            get_email_content=True)
+    print(mock_pulsar_step2)
+    print(email_contents)
 
-    #                                         split_steps="two")
-    # # node_counts, versions = MockFlow.get_current_flow(host_domain=host_domain, cookies=cookies,
+                                            # split_steps="two")
+    # node_counts, versions = MockFlow.get_current_flow(host_domain=host_domain, cookies=cookies,
     #                                                   flow_id="FLOW6749144046546626518")
 
     # 调试
-    # # 示例字典
-    # my_dict = {'name': 'Alice', 'age': 25, 'city': 'New York'}
-    # # 提取所有键到列表
-    # key_list = list(my_dict)
-    # print(key_list)
-    a = ["1", "3", "5"]
-    # b = ["3", "1", "5"]
-    # if a.sort() == b.sort():
-    #     print(1)
-    # else:
-    #     print(2)
+    # a = [{'049fd321-5a22-4f92-9692-a3da9507ee4b': {'completedCount': 44}},
+    #      {'09ff19db-33a3-41d8-88e9-12e6017ddfd3': {'completedCount': 44}},
+    #      {'31941d3a-910b-48fa-b302-0f3cf7790401': {'skippedCount': 7}},
+    #      {'01e7c21d-ab57-4f89-98ad-1a437bca1138': {'completedCount': 5}},
+    #      {'f3af15d5-848e-43d3-9ad3-d8f5172df6e0': {'completedCount': 5}},
+    #      {'15630c25-75fa-4456-a6ee-a2bd1e3e64a1': {'completedCount': 42}}]
+    # b = [{'049fd321-5a22-4f92-9692-a3da9507ee4b': {'completedCount': 44}},
+    #      {'09ff19db-33a3-41d8-88e9-12e6017ddfd3': {'completedCount': 44}},
+    #      {'31941d3a-910b-48fa-b302-0f3cf7790401': {'skippedCount': 7}},
+    #      {'01e7c21d-ab57-4f89-98ad-1a437bca1138': {'completedCount': 5}},
+    #      {'f3af15d5-848e-43d3-9ad3-d8f5172df6e0': {'completedCount': 5}},
+    #      {'15630c25-75fa-4456-a6ee-a2bd1e3e64a1': {'completedCount': 42}}]
+    # result = ListDictUtils.compare_lists(temp1=a,
+    #                                      temp2=b, num=1,
+    #                                      check_key=["completedCount", "skippedCount"],
+    #                                      all_key=False)
+    # print(result)
 
     # 断言邮件
     loginEmail, password = 'lulu9600000@gmail.com', 'evvurakhttndwspx'

smartpush/utils/ListDictUtils.py

@@ -14,14 +14,14 @@ def compare_lists(temp1, temp2, check_key=["completedCount"], all_key=False, num
                 # 获取内层字典
                 inner_dict_a = temp1_a[outer_key]
                 inner_dict_b = temp2_b[outer_key]
+                # 提取内层字典key并存入list中
                 inner_dict_a_keys = list(inner_dict_a)
-                inner_dict_b_keys = list(inner_dict_b)
                 if all_key is False:
-                    inner_dict_a_keys = inner_dict_b_keys = check_key
+                    inner_dict_a_keys = check_key
                 # 遍历内层字典的键
                 for inner_key in inner_dict_a_keys:
                     # 确保 temp2 对应的内层字典中也有相同的键
-                    if inner_key in inner_dict_b_keys:
+                    if inner_key in inner_dict_a.keys():
                         # 检查是否满足条件
                         if inner_dict_a[inner_key] + num != inner_dict_b[inner_key]:
                             error.append({

{smartpush-1.4.3.dist-info → smartpush-1.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smartpush
-Version: 1.4.3
+Version: 1.4.4
 Summary: 用于smartpush自动化测试工具包
 Author: lulu、felix、long
 

{smartpush-1.4.3.dist-info → smartpush-1.4.4.dist-info}/RECORD

@@ -1,19 +1,19 @@
 smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
 smartpush/get_jira_info.py,sha256=Ej2JRlO_Kct6Koju57b27ySy_B4q43f0I2bFcS_fmaw,17801
-smartpush/test.py,sha256=6i68LU4QJXsW-hDU7CMFeQ5YX8GoqPO6ik8DMkxlN78,35801
+smartpush/test.py,sha256=N2m5-MJvlKgTNk-kWq3eREzjBbirOiLJTMS9grVZu2Y,36723
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
 smartpush/export/basic/ExcelExportChecker.py,sha256=R_1gFy69vE2V5pY20zFsnhqWgJ42Vtf35zBtOPfhUpU,17590
 smartpush/export/basic/GetOssUrl.py,sha256=LeF1y1_uJaYXth1KvO6mEDS29ezb9tliBv5SrbqYkXc,6136
 smartpush/export/basic/ReadExcel.py,sha256=ZnG2mtYqLY-xuYx9SyulbdYUP_0E5jIeKDewfakAsTw,7342
 smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
-smartpush/flow/MockFlow.py,sha256=FE1gHq-os0o9ht167BhLY8DMzrfaDWNE4PzguQYdSIg,8068
+smartpush/flow/MockFlow.py,sha256=T8tZuJ9FLF0arbdu0PvbwXk-Ca-wjH46P-HCEW5aq2Y,8124
 smartpush/flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/utils/DataTypeUtils.py,sha256=BC7ioztO3vAfKd1EOoNvXdVuXYY8qjNskV1DP7LhW-M,1082
 smartpush/utils/EmailUtlis.py,sha256=DAHd73bJ8hiJCLEXtD0xcwxPD7SOPSmBB7Jvlf6gN6s,11201
-smartpush/utils/ListDictUtils.py,sha256=qXxpMwWoyaXwOHhSNUt55HtFfwmqli-wZTWmiP9qhsI,1657
+smartpush/utils/ListDictUtils.py,sha256=Fm5_d7UyY6xB8gySMPdl5jIFSRhXZcYXdYW-_L1alcE,1640
 smartpush/utils/StringUtils.py,sha256=n8mo9k0JQN63MReImgv-66JxmmymOGknR8pH2fkQrAo,4139
 smartpush/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush-1.4.3.dist-info/METADATA,sha256=h4DUmwI-lStzgapyf6UdgLFGbXK8S5_2MRBKmpbqHtE,131
-smartpush-1.4.3.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-smartpush-1.4.3.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.4.3.dist-info/RECORD,,
+smartpush-1.4.4.dist-info/METADATA,sha256=y2Y8f7qQqrwC-a9JiZmj0TSUDODHSY6bLZXV4z0nnhA,131
+smartpush-1.4.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+smartpush-1.4.4.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.4.4.dist-info/RECORD,,