Commit d3eab38a authored by wangmeng's avatar wangmeng

tijiao

parent 8015fd2c
...@@ -63,12 +63,12 @@ class ApiSerializer(serializers.ModelSerializer): ...@@ -63,12 +63,12 @@ class ApiSerializer(serializers.ModelSerializer):
} }
} }
def validate_expect_content(self,value): # def validate_expect_content(self,value):
if len(value)>0: # if len(value)>0:
if "=" not in value: # if "=" not in value:
raise ValidationError({'expect_content': '预期结果格式错误'}) # raise ValidationError({'expect_content': '预期结果格式错误'})
else: # else:
return value # return value
def create(self, validated_data): def create(self, validated_data):
arguments_list = validated_data.pop('arguments') arguments_list = validated_data.pop('arguments')
...@@ -90,7 +90,7 @@ class ApiSerializer(serializers.ModelSerializer): ...@@ -90,7 +90,7 @@ class ApiSerializer(serializers.ModelSerializer):
argumentExtract_list = validated_data.pop('argumentExtract') argumentExtract_list = validated_data.pop('argumentExtract')
instance.name = validated_data.get('name', instance.name) instance.name = validated_data.get('name', instance.name)
instance.http_method = validated_data.get('http_method', instance.http_method) instance.http_method = validated_data.get('http_method', instance.http_method)
instance.host = validated_data.get('host', instance.host) instance.host_id = validated_data.get('host_id', instance.host_id)
instance.path = validated_data.get('path', instance.path) instance.path = validated_data.get('path', instance.path)
instance.request_type = validated_data.get('request_type', instance.request_type) instance.request_type = validated_data.get('request_type', instance.request_type)
instance.data = validated_data.get('data', instance.data) instance.data = validated_data.get('data', instance.data)
......
...@@ -12,7 +12,7 @@ rouer.register('email',views.EmailViewSet) ...@@ -12,7 +12,7 @@ rouer.register('email',views.EmailViewSet)
urlpatterns = [ urlpatterns = [
#报告列表 #报告列表
re_path('list/', views.ReportVIew.as_view()), re_path('list/', views.ReportVIew.as_view()),
path('/list/<id>', views.ReportVIew.as_view()), path('/list/<id>/', views.ReportVIew.as_view()),
path('send/meail/<name>',views.mailReport), path('send/meail/<name>',views.mailReport),
#报告详情 #报告详情
path('<name>',views.reportDetails), path('<name>',views.reportDetails),
......
...@@ -23,8 +23,8 @@ def _task_id(task): ...@@ -23,8 +23,8 @@ def _task_id(task):
def add_task(task): def add_task(task):
trigger_kwargs = json.loads(task.expr) trigger_kwargs = json.loads(task.expr)
# _scheduler.add_job(run_case_test,args=[task.case_id],trigger="cron",id=_task_id(task),**trigger_kwargs) _scheduler.add_job(run_case_test,args=[task.case_id],trigger="cron",id=_task_id(task),**trigger_kwargs)
_scheduler.add_job(run_case_task,args=[task.case_id],trigger="cron",id=_task_id(task),**trigger_kwargs) # _scheduler.add_job(run_case_task,args=[task.case_id],trigger="cron",id=_task_id(task),**trigger_kwargs)
def remove_task(task): def remove_task(task):
job = _scheduler.get_job(_task_id(task)) job = _scheduler.get_job(_task_id(task))
......
Stack trace:
Frame Function Args
000FFFFCD30 00180062B0E (0018027FF90, 00180270E51, 000FFFFCD30, 000FFFFBA10)
000FFFFCD30 0018004846A (00100002000, 00800000010, 00800000010, 00000000002)
000FFFFCD30 001800484A2 (00000000002, 00180354488, 000FFFFCD30, 00000000008)
000FFFFCD30 0018005BAF9 (001800DB5DE, 205C745C615C635C, 655C645C2F5C3E5C, 745C745C2F5C765C)
000FFFFCD30 0018005BBAF (635C655C205C265C, 3E5C205C6F5C685C, 765C655C645C2F5C, 795C745C745C2F5C)
000FFFFCD30 00180048C0C (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFFFF0 00180047716 (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFFFF0 001800477C4 (00000000000, 00000000000, 00000000000, 00000000000)
End of stack trace
...@@ -40,7 +40,7 @@ def get_discover(): ...@@ -40,7 +40,7 @@ def get_discover():
times = today - datetime.timedelta(days=0) times = today - datetime.timedelta(days=0)
data = { data = {
"project_name":"fusion_report-{}".format(report_time), "project_name":"fusion_report-{}".format(report_time),
"project_host":"staging", "project_host":"test",
"case_type":"接口", "case_type":"接口",
"case_all":result.testsRun, "case_all":result.testsRun,
"case_pass":result.success_count, "case_pass":result.success_count,
......
...@@ -25,7 +25,7 @@ def get_discover(): ...@@ -25,7 +25,7 @@ def get_discover():
# 报告文件名称,默认为report.html # 报告文件名称,默认为report.html
filename='fusion_report-{}'.format(report_time), filename='fusion_report-{}'.format(report_time),
# 测试报告展示名字 # 测试报告展示名字
description='丽维家接口测试报告', description='fusiontest接口测试报告',
# 报告存放路径 # 报告存放路径
report_dir=os.path.join(BASE_PATH, 'templates/report'), report_dir=os.path.join(BASE_PATH, 'templates/report'),
# 测试报告主题样式 # 测试报告主题样式
...@@ -37,7 +37,7 @@ def get_discover(): ...@@ -37,7 +37,7 @@ def get_discover():
times = today - datetime.timedelta(days=0) times = today - datetime.timedelta(days=0)
data = { data = {
"project_name":"fusion_report-{}".format(report_time), "project_name":"fusion_report-{}".format(report_time),
"project_host":"staging", "project_host":"test",
"case_type":"接口", "case_type":"接口",
"case_all":result.testsRun, "case_all":result.testsRun,
"case_pass":result.success_count, "case_pass":result.success_count,
......
...@@ -24,7 +24,7 @@ def get_discover(): ...@@ -24,7 +24,7 @@ def get_discover():
# 报告文件名称,默认为report.html # 报告文件名称,默认为report.html
filename='fusion_report-{}'.format(report_time), filename='fusion_report-{}'.format(report_time),
# 测试报告展示名字 # 测试报告展示名字
description='丽维家接口测试报告', description='fusiontest接口测试报告',
# 报告存放路径 # 报告存放路径
report_dir=os.path.join(BASE_PATH, 'templates/report'), report_dir=os.path.join(BASE_PATH, 'templates/report'),
# 测试报告主题样式 # 测试报告主题样式
...@@ -36,7 +36,7 @@ def get_discover(): ...@@ -36,7 +36,7 @@ def get_discover():
times = today - datetime.timedelta(days=0) times = today - datetime.timedelta(days=0)
data = { data = {
"project_name":"fusion_report-{}".format(report_time), "project_name":"fusion_report-{}".format(report_time),
"project_host":"staging", "project_host":"test",
"case_type":"接口", "case_type":"接口",
"case_all":result.testsRun, "case_all":result.testsRun,
"case_pass":result.success_count, "case_pass":result.success_count,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment