修复报告不能正确获取错误截图的问题

Author: wuranxu

result/generator.py

@@ -34,6 +34,7 @@ def generate(result, startTime):
 
     for case in test_cases:
         case_id = case.get("case_id")
+        case_pic = case.get("case_id") + "_" + case['case']._testMethodName
         _case = case.get("case")
         msg = case.get("msg")
         msg = msg[1].__str__() if msg and case["type"] != "info" else msg
@@ -50,7 +51,7 @@ def generate(result, startTime):
             case_des = "登录初始化模块"
         else:
             case_des = getattr(getattr(_case, case_name), "__doc__")
-        test_cases_list.append((case_id, suite, status, msg, case_des))
+        test_cases_list.append((case_id, suite, status, msg, case_des, case_pic))
     # 通过case_id排序
     # test_cases_list = sorted(test_cases_list, key=lambda x: x[0])
     total_test = len(test_cases_list)

templates/report_template.html

@@ -158,7 +158,7 @@ <h2 class="text-capitalize">{{ title }}</h2>
                                 {% if case[2] != 'success' and case[2] != 'info' %}
                                     {% if conf.screenshot %}
                                         <td><a class="ant-btn ant-btn-sm screenshot"
-                                               title="data:image/png;base64,{{ conf.screenshot.get(case[0]) }}"
+                                               title="data:image/png;base64,{{ conf.screenshot.get(case[5]) }}"
                                                type="button">screenshot</a>
                                             {% if "success" not in case[2] %}
                                                 &nbsp

tests/Example/Search.py

@@ -14,14 +14,14 @@ def test_haha(self):
         main = Index(self.driver)
         main.search_dragonball_super()
         # 断言
-        self.assertEqual("龙珠超 - 国内版 Bing", self.driver.title,
+        self.assertEqual("龙珠超2 - 国内版 Bing", self.driver.title,
                          "bing搜索'龙珠超'后页面标题与预期不符")
 
     @screenshot
     def test_dragon_ball_z(self):
         """搜索龙珠超 case2"""
         # 断言
-        self.assertEqual("龙珠超2 - 国内版 Bing", self.driver.title,
+        self.assertEqual("龙珠超22 - 国内版 Bing", self.driver.title,
                          "bing搜索'龙珠超'后页面标题与预期不符")
 
 

util/decorator.py

@@ -57,17 +57,17 @@ def generate_bs64(filename):
     return b64
 
 
-def update_pic_info(case_id, filename):
+def update_pic_info(case_id, test_func, filename):
     if hasattr(Config, "screenshot"):
-        getattr(Config, "screenshot").update({case_id: generate_bs64(filename)})
+        getattr(Config, "screenshot").update({case_id + "_" + test_func: generate_bs64(filename)})
     else:
-        setattr(Config, "screenshot", {case_id: generate_bs64(filename)})
+        setattr(Config, "screenshot", {case_id + "_" + test_func: generate_bs64(filename)})
 
 
-def screen(driver, func, case_id):
+def screen(driver, func, case_id, test_func):
     t = Tools(driver)
     filename = t.get_pic(func.__name__, case_id)
-    update_pic_info(case_id, filename)
+    update_pic_info(case_id, test_func, filename)
 
 
 def pic(*params):
@@ -113,7 +113,7 @@ def wrapper(*args, **kwargs):
                     Log.warning("{}_{}用例第{}次失败: {}".format(
                         args[0].__class__.__name__, params[0].__name__, i, error.__str__()))
             else:
-                screen(driver, params[0], case_id)
+                screen(driver, params[0], case_id, args[0]._testMethodName)
                 if isinstance(error, AssertionError):
                     assert 0, "错误信息: {}".format(str(error))
                 else:
@@ -134,7 +134,7 @@ def wrapper(*args, **kwargs):
             error = e
             Log.warning("{}_{}用例运行失败: {}".format(
                 args[0].__class__.__name__, func.__name__, error.__str__()))
-            screen(driver, func, case_id)
+            screen(driver, func, case_id, args[0]._testMethodName)
             if isinstance(error, AssertionError):
                 assert 0, "Info: {}".format(str(error))
             else: