smartpush 1.4.8__py3-none-any.whl → 1.5.0__py3-none-any.whl

smartpush/export/basic/ExcelExportChecker.py

@@ -293,8 +293,6 @@ def check_excel_header_by_list(actual, expected, **kwargs):
     @return:
     @return:
     """
-
-    global diff
     try:
         if not isinstance(actual, io.BytesIO):
             actual = read_excel_from_oss(actual)
@@ -304,13 +302,13 @@ def check_excel_header_by_list(actual, expected, **kwargs):
         try:
             diff = compare_lists(actual1, expected1)
             assert not diff  # 为空则错误
-            return True, "表头校验值与顺序一致"
-        except AssertionError as e:
+            return True
+        except AssertionError:
             print("actual:", actual1)
             print("expected:", expected1)
-            return False, f"表头校验值与顺序失败 {diff}"
+            return False
     except Exception as e:
-        return False, e
+        raise e
 
 
 def get_header_map_data(name_list):
@@ -323,12 +321,16 @@ def get_header_map_data(name_list):
         "sendTypeName": "活动类型",
         "activityName": "活动名称",
         "sendTotal": "发送数",
-        "deliveryTotal": "送达数",
+        "deliveryTotal": "送达人数",
         "deliveryRate": "送达率",
-        "openRate": ["打开率（打开数/送达数）", "打开数"],
-        "noRepeatOpenRate": ["不重复打开率", "不重复打开"],
-        "clickRate": ["点击率（点击数/送达数）", "点击数"],
-        "noRepeatClickRate": ["不重复点击率", "不重复点击"],
+        # "openRate": ["打开率（打开数/送达数）", "打开数"],
+        "openRate": "打开率（打开数/送达数）",
+        # "noRepeatOpenRate": ["不重复打开率", "不重复打开"],
+        "noRepeatOpenRate": "不重复打开率",
+        # "clickRate": ["点击率（点击数/送达数）", "点击数"],
+        "clickRate": "点击率（点击数/送达数）",
+        # "noRepeatClickRate": ["不重复点击率", "不重复点击"],
+        "noRepeatClickRate": "不重复点击率",
         "salesPriceTotal": "销售额",
         "orderTotal": "订单数",
         "averageOrderValue": "平均订单价值",
@@ -450,4 +452,4 @@ def check_field_format(actual_oss, **kwargs):
                                 f"{actual_dict_key[key]} 表, 第{num}行{filed_key}列{kwargs['fileds'][key][filed_key]}格式不符合规范, 值为:{row[filed_key]}")
                     num += 1
     print(errors if len(errors) > 0 else "都校验成功")
-    return False if len(errors) > 0 else True
+    return False if len(errors) > 0 else True

{smartpush-1.4.8.dist-info → smartpush-1.5.0.dist-info}/METADATA

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

{smartpush-1.4.8.dist-info → smartpush-1.5.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ smartpush/base/faker_data.py,sha256=TOd5EKVImxZpsKEW_dtKa2iqiUGqU7OBkOM8pvqKVUc,
 smartpush/base/request_base.py,sha256=Fn1uPWgaZQZdu8yyi2n13nuiKPVeR95iwx99sG6XGVU,574
 smartpush/base/url_enum.py,sha256=REHYP_aa0xumLg8El-yrNRpablLnPEQpss8ZNPdkNtg,787
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=CFTytcowwf1xfoRE5DZayY8kKJqppYQ0smVIokfxitM,19833
+smartpush/export/basic/ExcelExportChecker.py,sha256=p3NIjZuXlCprIYkKQlRqoCQpU8shwa2S8k6LJZxnnF4,19957
 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
@@ -22,7 +22,7 @@ smartpush/utils/ListDictUtils.py,sha256=Fm5_d7UyY6xB8gySMPdl5jIFSRhXZcYXdYW-_L1a
 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.4.8.dist-info/METADATA,sha256=_Fh1DOsWYzvBYYvSbFzc98qbWwEGBrsGgC3RjmStBno,131
-smartpush-1.4.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.4.8.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.4.8.dist-info/RECORD,,
+smartpush-1.5.0.dist-info/METADATA,sha256=_d7i8OmR9fUZB0kjfo-zFSP2lzBmFA4fO-befH3b0uA,131
+smartpush-1.5.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.5.0.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.5.0.dist-info/RECORD,,