smartpush 2.1.1__py3-none-any.whl → 2.1.3__py3-none-any.whl

smartpush/crowd/crowd.py

@@ -61,7 +61,7 @@ class Crowd(CrowdRequestBase):
         resultData = result['resultData']
         return resultData
 
-    def check_crowd(self, expected_rule, expected_ids, sleep=5):
+    def check_crowd(self, expected_rule, expected_ids=None, sleep=5):
         """校验群组结果"""
         result = {}
         # 校验群组详情条件
@@ -73,10 +73,13 @@ class Crowd(CrowdRequestBase):
         # 校验群组筛选人群
         time.sleep(sleep)
         crowd_persons = self.callCrowdPersonListInPackage()
-        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)
+        if expected_ids is not None:
+            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)
+        else:
+            result["联系人断言"] = [True, "接口返回正常"]
         return result
 
 

smartpush/export/basic/ExcelExportChecker.py

@@ -340,7 +340,7 @@ def get_header_map_data(name_list):
         "sendTypeName": "活动类型",
         "activityName": "活动名称",
         "sendTotal": "发送数",
-        "deliveryTotal": "送达人数",  # 原本是送达人数
+        "deliveryTotal": "送达数",  # 原本是送达人数
         "deliveryRate": "送达率",
         "openRate": ["打开率（打开数/送达数）", "打开次数"],
         # "openRate": "打开率（打开数/送达数）",

{smartpush-2.1.1.dist-info → smartpush-2.1.3.dist-info}/METADATA

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

{smartpush-2.1.1.dist-info → smartpush-2.1.3.dist-info}/RECORD

@@ -1,6 +1,5 @@
 smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
 smartpush/get_jira_info.py,sha256=s3hPwC6KePS5BtqNS9o15eCh7Nx2gn16bn6tfYK0iQI,18112
-smartpush/test.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/account/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/account/operate_account.py,sha256=nzJLLAEwNElavZeWVqnA_MSGTBzQrSrknmezYBwtvWs,1525
 smartpush/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10,13 +9,13 @@ smartpush/base/url_enum.py,sha256=47XCczKEvTcO6Ap4VbEfV7K_S0t2xu3O434sHqwycE4,28
 smartpush/contacts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/contacts/contacts.py,sha256=JssmzyHmFF6TeIKpFH6VvGC5abBXOzkSwZrAWA8v8a8,1718
 smartpush/crowd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/crowd/crowd.py,sha256=jxX8svt6bRytGLSYiZbCn5RnE7OiRZH0QGgPawlMhMU,10646
+smartpush/crowd/crowd.py,sha256=IAwzmAsYe4hNM_CqNXMs4bUmLqeR7bOaobBA8jTf4ao,10787
 smartpush/email/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/email/activity.py,sha256=rQ62GIfg0Yh0fFkwiaRIVATBn5vY1wZzbLEJLwHmx1E,10016
 smartpush/email/schema.py,sha256=mysik-N6cry4HuSxzMMhQFsnnu5_UJ_oqVPTGY1RUkQ,31471
 smartpush/email/universal_content.py,sha256=bST0RCVN4YUglrsCv0OsIox7vceEvJRVkqcMaEgj9No,17226
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=YqWmDGSFadQdK2vNJ070Qvad9ZtqEwiQyPkOemlACfs,21508
+smartpush/export/basic/ExcelExportChecker.py,sha256=FAO7jfnJApH_SXINIRxvlyW3FdV5iJiO4NQF3DeI59A,21505
 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
@@ -38,7 +37,7 @@ smartpush/utils/StringUtils.py,sha256=n8mo9k0JQN63MReImgv-66JxmmymOGknR8pH2fkQrA
 smartpush/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/utils/date_utils.py,sha256=Xgx2DbmWYri71xXBiaKYTZDeh2a8MFhYns_xB0U2JOA,13159
 smartpush/utils/form_utils.py,sha256=ld-g_Dm_ZlnagQt7imYfUc87bcBRVlTctywuLtzmjXQ,849
-smartpush-2.1.1.dist-info/METADATA,sha256=FERE2Oyr7a7q1u94X4AVcYfySe0H0LZzaNKLPVP3-nA,131
-smartpush-2.1.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-2.1.1.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-2.1.1.dist-info/RECORD,,
+smartpush-2.1.3.dist-info/METADATA,sha256=P0DMMKDLIijn5-ENVHcsRux4cBQQoXxV2PR5iopxUSc,131
+smartpush-2.1.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-2.1.3.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-2.1.3.dist-info/RECORD,,