Default Changelist

apps/apiTest/serializers.py

@@ -96,6 +96,7 @@ class ApiSerializer(serializers.ModelSerializer):
                 instance.data = validated_data.get('data', instance.data)
                 instance.description = validated_data.get('description', instance.description)
                 instance.expect_code = validated_data.get('expect_code', instance.expect_code)
+                instance.headers = validated_data.get('headers', instance.headers)
                 instance.expect_content = validated_data.get('expect_content', instance.expect_content)
                 instance.save()
                 # 删除api的全局参数和用例API的响应参数提取再新增

lwjTest.ini

 [uwsgi]
 chdir = /app
-wsgi-file = fusionTest/wsgi.py
+wsgi-file = lwjTest/wsgi.py
 master = True
 processes = 4
 harakiri = 7200

utils/testGenerateManySuite.py

@@ -18,7 +18,7 @@ BASE_PATH=os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # import django
 
 # django.setup()
-
+import datetime
 def get_discover():
     report_time = time.strftime("%Y-%m-%d-%H-%M-%S", time.localtime())
     test_suite = unittest.defaultTestLoader.discover("utils", pattern='testGenerateManyCase.py')
@@ -36,6 +36,8 @@ def get_discover():
     )
     curpath = os.path.dirname(os.path.realpath(__file__))  # 获取文件当前路径
     yamlpath = os.path.join(curpath, "case.yaml")  # 获取yaml文件地址
+    today = datetime.datetime.now().replace(microsecond=0)
+    times = today - datetime.timedelta(days=0)
     data = {
         "project_name":"fusion_report-{}".format(report_time),
         "project_host":"staging",
@@ -43,9 +45,9 @@ def get_discover():
         "case_all":result.testsRun,
         "case_pass":result.success_count,
         "case_fail":result.failure_count,
-        "start_time":result.begin_time,
+        "start_time":str(times),
         "run_time":result.fields['totalTime'],
-        "report_details":HOST+"/report/fusion_http_report-{}.html/".format(report_time)
+        "report_details":HOST+"/report/fusion_http_report-{}.html".format(report_time)
     }
     with open(yamlpath, 'w', encoding='utf-8') as f:
         yaml.dump(data, f, Dumper=yaml.RoundTripDumper,allow_unicode=True)

utils/testManySuite.py

@@ -7,7 +7,7 @@ from BeautifulReport import BeautifulReport
 from lwjTest.settings import *
 BASE_PATH=os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 import os
-
+import datetime
 # if not os.environ.get('DJANGO_SETTINGS_MODULE'):
 #     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'demo3.settings')
 
@@ -33,6 +33,8 @@ def get_discover():
     )
     curpath = os.path.dirname(os.path.realpath(__file__))  # 获取文件当前路径
     yamlpath = os.path.join(curpath, "case.yaml")  # 获取yaml文件地址
+    today = datetime.datetime.now().replace(microsecond=0)
+    times = today - datetime.timedelta(days=0)
     data = {
         "project_name":"fusion_report-{}".format(report_time),
         "project_host":"staging",
@@ -40,9 +42,9 @@ def get_discover():
         "case_all":result.testsRun,
         "case_pass":result.success_count,
         "case_fail":result.failure_count,
-        "start_time":result.begin_times,
+        "start_time":str(times),
         "run_time":result.fields['totalTime'],
-        "report_details":HOST + "/lwjTest/templates/report/fusion_http_report-{}.html".format(report_time)
+        "report_details":HOST + "/report/fusion_http_report-{}.html".format(report_time)
     }
     with open(yamlpath, 'w', encoding='utf-8') as f:
         yaml.dump(data, f, Dumper=yaml.RoundTripDumper,allow_unicode=True)

utils/testSingleSuite.py

@@ -7,7 +7,7 @@ from BeautifulReport import BeautifulReport
 from lwjTest.settings import *
 BASE_PATH=os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 import os
-
+import datetime
 # if not os.environ.get('DJANGO_SETTINGS_MODULE'):
 #     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'demo3.settings')
 
@@ -32,7 +32,8 @@ def get_discover():
     )
     curpath = os.path.dirname(os.path.realpath(__file__))  # 获取文件当前路径
     yamlpath = os.path.join(curpath, "case.yaml")  # 获取yaml文件地址
-    logger.info(result.begin_times)
+    today = datetime.datetime.now().replace(microsecond=0)
+    times = today - datetime.timedelta(days=0)
     data = {
         "project_name":"fusion_report-{}".format(report_time),
         "project_host":"staging",
@@ -41,9 +42,9 @@ def get_discover():
         "case_pass":result.success_count,
         "case_fail":result.failure_count,
         # "start_time":result.begin_times,
-            "start_time": "2022/5/23 10:00:00",
+            "start_time": str(times),
         "run_time":result.fields['totalTime'],
-        "report_details":HOST + "/lwjTest/templates/report/fusion_http_report-{}.html".format(report_time)
+        "report_details":HOST + "/report/fusion_http_report-{}.html".format(report_time)
     }
     with open(yamlpath, 'w', encoding='utf-8') as f:
         yaml.dump(data, f, Dumper=yaml.RoundTripDumper,allow_unicode=True)