smartpush 1.9.6__py3-none-any.whl → 1.9.8__py3-none-any.whl

smartpush/crowd/crowd.py

@@ -1,6 +1,6 @@
 import json
 import time
-
+from smartpush.utils import ListDictUtils
 from smartpush.base.request_base import CrowdRequestBase, RequestBase
 from smartpush.base.url_enum import URL
 from smartpush.export.basic.ExcelExportChecker import compare_lists, compare_dicts
@@ -61,24 +61,20 @@ class Crowd(CrowdRequestBase):
         result = {}
         # 校验群组详情条件
         crowd_detail = self.callCrowdPackageDetail()
-        if crowd_detail["resultData"]["groupRules"] == expected_rule:
+        if crowd_detail["groupRules"] == expected_rule:
             result["rule"] = True
         else:
-            result["rule"] = {"条件断言": False, "实际条件": crowd_detail["resultData"]["groupRules"]}
+            result["rule"] = {"条件断言": False, "实际条件": crowd_detail["groupRules"]}
         # 校验群组筛选人群
         time.sleep(sleep)
         crowd_persons = self.callCrowdPersonListInPackage()
-        crowd_person_uids = [person["uid"] for person in crowd_persons]
-        not_in_uid = expected_ids - crowd_person_uids
-        if not_in_uid:
-            result["uid"] = {"人群断言": False, "未匹配到的uid": not_in_uid}
-        else:
-            result["uid"] = True
-
+        crowd_person_uids = [person["uid"] for person in crowd_persons["responseResult"]]
+        print("expected_ids", expected_ids, type(expected_ids))
+        print("crowd_person_uids", crowd_person_uids, type(crowd_person_uids))
+        result["联系人断言"] = ListDictUtils.check_values_in_list_set(a=expected_ids, b=crowd_person_uids)
         return result
 
 
-
 class CrowdList(RequestBase):
     def callCrowdPackageList(self, page=1, pageSize=20):
         """

smartpush/flow/MockFlow.py

@@ -102,16 +102,13 @@ def check_flow(host_domain, cookies, mock_domain="", **kwargs):
     split_node: list，有拆分节点时需填，结构：如: ["false", "true"]，即走到拆分节点限制不满足分支再走满足分支
     get_email_content: bool，默认false, 提取邮件内容，用于断言邮箱内是否送达
     """
-    # todo: 还差邮件校验部分，后续补充
     is_split_steps = kwargs.get("split_steps", "all")
     # 步骤1 - 所需字段：split_steps、host_domain、cookies、flow_id、pulsar
     if is_split_steps == "one" or is_split_steps == "all":
-        # 触发前提取flow数据，后续做对比
-        old_flow_counts, old_versions, _ = get_current_flow(host_domain=host_domain, cookies=cookies,
-                                                            flow_id=kwargs["flow_id"],
-                                                            splits=kwargs.get("split_node", None))
-        kwargs["old_flow_counts"] = old_flow_counts
-        print(f"触发前节点数据: {old_flow_counts}")
+        # 提取版本号
+        _, old_versions, _ = get_current_flow(host_domain=host_domain, cookies=cookies,
+                                              flow_id=kwargs["flow_id"],
+                                              splits=kwargs.get("split_node", None))
         # 更新flow
         if kwargs.get("update_flow_params", False):
             global_flow.update_flow(host_domain=host_domain, cookies=cookies,
@@ -124,6 +121,14 @@ def check_flow(host_domain, cookies, mock_domain="", **kwargs):
         # 启动flow
         global_flow.start_flow(host_domain=host_domain, cookies=cookies, flow_id=kwargs["flow_id"],
                                version=old_versions, draft_snap_version=draft_snap_version)
+
+        # 触发前提取flow数据，后续做对比
+        old_flow_counts, _, _ = get_current_flow(host_domain=host_domain, cookies=cookies,
+                                                 flow_id=kwargs["flow_id"],
+                                                 splits=kwargs.get("split_node", None))
+        time.sleep(3)
+        kwargs["old_flow_counts"] = old_flow_counts
+        print(f"触发前节点数据: {old_flow_counts}")
         # 触发flow
         mock_pulsar(mock_domain=mock_domain, pulsar=kwargs["pulsar"], limit=kwargs.get("limit", 1))
         if is_split_steps == "one":

smartpush/utils/ListDictUtils.py

@@ -1,6 +1,6 @@
 import json
 
-# from deepdiff import DeepDiff
+from deepdiff import DeepDiff
 
 
 def compare_lists(temp1, temp2, check_key=["completedCount"], all_key=False, num=1):
@@ -70,3 +70,16 @@ def all_in_list(list_a, list_b):
         # 支持列表、元组、集合等可迭代类型
         print(f"判断对象【{list_a}】在 {list_b}")
         return set(list_a).issubset(set(list_b))
+
+
+def check_values_in_list_set(a, b):
+    """
+    使用集合检查列表a中的所有值是否都在列表b中（效率更高）
+    """
+    set_b = set(b)
+    missing_values = [x for x in a if x not in set_b]
+
+    if not missing_values:
+        return [True, "匹配成功"]
+    else:
+        return [False, "匹配失败，不匹配数据" + str(missing_values)]

{smartpush-1.9.6.dist-info → smartpush-1.9.8.dist-info}/METADATA

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

{smartpush-1.9.6.dist-info → smartpush-1.9.8.dist-info}/RECORD

@@ -7,7 +7,7 @@ smartpush/base/faker_data.py,sha256=TOd5EKVImxZpsKEW_dtKa2iqiUGqU7OBkOM8pvqKVUc,
 smartpush/base/request_base.py,sha256=mg0dSm6ucPdwqSUn_tQzynYWYKf0_vX7kcGJWSsX3e0,2455
 smartpush/base/url_enum.py,sha256=GC8lXuXflKFl3xbeOIzS3vgE7BF2Zo5H9pn6okgHPyQ,1627
 smartpush/crowd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/crowd/crowd.py,sha256=8z5FIWCiTeSUQJGWbLLjS_2AsPbVOsW0GrSZKnYtgng,20985
+smartpush/crowd/crowd.py,sha256=-UrOLAhWaYXUk3V2ezy4xkYDxJAmKD1KtccSrPm5PQY,21059
 smartpush/email/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/email/schema.py,sha256=Gf9tYNP9UjkbXpPbh_uAcAx7QZ5RNs-E7GPVp1BU9d8,23478
 smartpush/email/universal_content.py,sha256=By8ZzhPEvTYuktPfh_wRwRSYnntwoV5qJd3mXzkrSg4,9063
@@ -16,7 +16,7 @@ smartpush/export/basic/ExcelExportChecker.py,sha256=YqWmDGSFadQdK2vNJ070Qvad9Ztq
 smartpush/export/basic/GetOssUrl.py,sha256=zxNZj6x7Ph9N3P5k82pLpBFjZxKrDfbgqS2fTYyhvso,8467
 smartpush/export/basic/ReadExcel.py,sha256=SbVRBKd4Y1UPUXXnvyQ3J6WtZLinwTCYpBos1D6_wtU,8921
 smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
-smartpush/flow/MockFlow.py,sha256=QVEONbTOswKMPLvJWaBa6csMcybPldCImQhUFGFUWh8,7733
+smartpush/flow/MockFlow.py,sha256=L-T_x8hieHs1nPDsP2BUSa6q4pVuiURVN2xP9njakzs,7943
 smartpush/flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/flow/global_flow.py,sha256=D1hCpO5fsWTEfl4yNpi3O8PFhz_UmKLHSIQhKtypkvU,2817
 smartpush/flow/history_flow.py,sha256=Gds1FI6i9ue-n1WwpNgL2JlQ2PhSR8VK7dvZ9JemZKw,4854
@@ -27,11 +27,11 @@ smartpush/form/form_before.py,sha256=CCvAC_2yWPlnQGtjEA8LPLy9853Nq3nNjcL2GewFWIs
 smartpush/form/form_client_operation.py,sha256=gg-5uHXCyMa_ypBSYPYFVxXdwZdYBJsNtUCqayknMBw,303
 smartpush/utils/DataTypeUtils.py,sha256=BC7ioztO3vAfKd1EOoNvXdVuXYY8qjNskV1DP7LhW-M,1082
 smartpush/utils/EmailUtlis.py,sha256=DAHd73bJ8hiJCLEXtD0xcwxPD7SOPSmBB7Jvlf6gN6s,11201
-smartpush/utils/ListDictUtils.py,sha256=cLaZSQD-MrwZLdotyHMY6vdEF-HNNsbSv87YFRWyt04,2826
+smartpush/utils/ListDictUtils.py,sha256=6jIngO_4vARkKTKRb9ZW4wR7zPkYbc1wiMLF7ySZQXc,3191
 smartpush/utils/StringUtils.py,sha256=n8mo9k0JQN63MReImgv-66JxmmymOGknR8pH2fkQrAo,4139
 smartpush/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/utils/form_utils.py,sha256=ld-g_Dm_ZlnagQt7imYfUc87bcBRVlTctywuLtzmjXQ,849
-smartpush-1.9.6.dist-info/METADATA,sha256=3IJzh7R4m2M9oI2nzR4winfDMSA4QTZgEflASPnIxjU,131
-smartpush-1.9.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.9.6.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.9.6.dist-info/RECORD,,
+smartpush-1.9.8.dist-info/METADATA,sha256=ocrGVX8kR0kE0c9y61_E9wck8yNGFExrAuK9XApli2c,131
+smartpush-1.9.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.9.8.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.9.8.dist-info/RECORD,,