diff --git a/.idea/jiekou-python3.iml b/.idea/jiekou-python3.iml
deleted file mode 100644
index d0876a7..0000000
--- a/.idea/jiekou-python3.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 65531ca..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index eb045ae..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2945788..bd4f338 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,26 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -30,23 +49,41 @@
-
-
+
+
-
-
-
-
-
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -55,7 +92,7 @@
-
+
@@ -66,8 +103,8 @@
-
-
+
+
@@ -75,18 +112,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -132,7 +157,7 @@
true
DEFINITION_ORDER
-
+
@@ -327,8 +352,7 @@
-
-
+
@@ -336,7 +360,7 @@
-
+
@@ -365,35 +389,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -461,9 +461,7 @@
-
-
-
+
@@ -609,13 +607,6 @@
-
-
-
-
-
-
-
@@ -626,8 +617,8 @@
-
-
+
+
@@ -657,35 +648,23 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
-
+
@@ -703,11 +682,51 @@
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Public/emmail.py b/Public/emmail.py
deleted file mode 100644
index 704cea6..0000000
--- a/Public/emmail.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-# @Author : leizi
-import smtplib,time
-from email.mime.text import MIMEText
-from email.mime.multipart import MIMEMultipart
-def load_emil_setting():#从配置文件中加载获取email的相关信息
- import yaml
- data_file = open(r".\\config\\email.yaml","r")
- datas = yaml.load(data_file)
- data_file.close()
- return (datas['foremail'],datas['password'],datas['toeamil'],datas['title'])
-def sendemali(filepath): #发送email
- from_addr,password,mail_to,mail_body=load_emil_setting()
- msg = MIMEMultipart()
- msg['Subject'] = '接口自动化测试报告'
- msg['From'] ='自动化测试平台'
- msg['To'] = mail_to
- msg['Date'] = time.strftime('%a, %d %b %Y %H:%M:%S %z')
- att = MIMEText(open(r'%s'%filepath, 'rb').read(), 'base64', 'utf-8')
- att["Content-Type"] = 'application/octet-stream'
- att["Content-Disposition"] = 'attachment; filename="pyresult.html"'
- txt = MIMEText("这是测试报告的邮件，详情见附件",'plain','gb2312')
- msg.attach(txt)
- msg.attach(att)
- smtp = smtplib.SMTP()
- server = smtplib.SMTP_SSL("smtp.qq.com",465)
- server.login(from_addr, password)
- server.sendmail(from_addr, mail_to, msg.as_string())
- server.quit()
\ No newline at end of file
diff --git a/config/email.yaml b/config/email.yaml
deleted file mode 100644
index cfca931..0000000
--- a/config/email.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-foremail: '952943386@qq.com'
-password: "呃呃呃"
-toeamil: "leileili126@163.com,952943386@qq.com"
-title: "测试报告"
\ No newline at end of file
diff --git a/log/jiekou-2018-03-23-15.log b/log/jiekou-2018-03-23-15.log
deleted file mode 100644
index 387eac8..0000000
--- a/log/jiekou-2018-03-23-15.log
+++ /dev/null
@@ -1,120 +0,0 @@
-[2018-03-23 15:13:24.505456] INFO: jiekou: 当前模块 requests封装
-[2018-03-23 15:13:24.507456] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:13:24.508456] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:13:24.670466] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-23 15:13:24.671466] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:13:24.671466] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:13:24.816474] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-23 15:13:24.816474] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:13:24.816474] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:13:24.819474] INFO: jiekou: 当前模块 测试
-[2018-03-23 15:13:24.820474] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:13:24.820474] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:13:24.891478] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:http://www.tuling123.com/openapi/api ,返回:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}},预期:code=40001
-[2018-03-23 15:13:24.891478] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:13:24.891478] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:13:24.891478] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': 'code=40001', 'fanhuijson': {'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}}
-[2018-03-23 15:13:24.919480] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:http://www.tuling123.com/openapi/api
- ,返回:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}},预期:code=40002
-[2018-03-23 15:13:24.920480] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:13:24.920480] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:13:24.920480] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': 'code=40002', 'fanhuijson': {'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}}
-[2018-03-23 15:13:25.114491] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:https://api.douban.com/v2/photo/:id ,返回:{'code': 0, 'result': {'msg': 'uri_not_found', 'code': 1001, 'request': 'GET /v2/photo/:id'}},预期:
-[2018-03-23 15:13:25.114491] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:13:25.114491] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:13:25.114491] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': '', 'fanhuijson': {'code': 0, 'result': {'msg': 'uri_not_found', 'code': 1001, 'request': 'GET /v2/photo/:id'}}}
-[2018-03-23 15:13:25.115491] INFO: jiekou: 填写测试预期值
-[2018-03-23 15:14:02.462627] INFO: jiekou: 当前模块 requests封装
-[2018-03-23 15:14:02.463627] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:02.463627] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:14:02.473628] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-23 15:14:02.473628] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:02.473628] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:14:02.485629] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-23 15:14:02.485629] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:02.485629] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:14:02.489629] INFO: jiekou: 当前模块 测试
-[2018-03-23 15:14:02.489629] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:02.489629] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:14:02.523631] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:http://www.tuling123.com/openapi/api ,返回:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}},预期:code=40001
-[2018-03-23 15:14:02.523631] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:14:02.523631] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:02.524631] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': 'code=40001', 'fanhuijson': {'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}}
-[2018-03-23 15:14:02.546632] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:http://www.tuling123.com/openapi/api
- ,返回:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}},预期:code=40002
-[2018-03-23 15:14:02.546632] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:14:02.546632] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:02.547632] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': 'code=40002', 'fanhuijson': {'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}}
-[2018-03-23 15:14:02.639637] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:https://api.douban.com/v2/photo/:id ,返回:{'code': 0, 'result': {'msg': 'uri_not_found', 'code': 1001, 'request': 'GET /v2/photo/:id'}},预期:
-[2018-03-23 15:14:02.640637] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:14:02.640637] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:02.640637] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': '', 'fanhuijson': {'code': 0, 'result': {'msg': 'uri_not_found', 'code': 1001, 'request': 'GET /v2/photo/:id'}}}
-[2018-03-23 15:14:02.641637] INFO: jiekou: 填写测试预期值
-[2018-03-23 15:14:02.750644] INFO: jiekou: 当前模块 保存测试结果
-[2018-03-23 15:14:02.751644] INFO: jiekou: 全部args参数参数信息 , (datetime.datetime(2018, 3, 23, 15, 14, 2, 485629), 3, 0, 2)
-[2018-03-23 15:14:02.751644] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:14:37.586636] INFO: jiekou: 当前模块 requests封装
-[2018-03-23 15:14:37.587636] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:37.587636] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:14:37.597637] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-23 15:14:37.597637] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:37.597637] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:14:37.730644] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-23 15:14:37.730644] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:37.730644] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:14:37.738645] INFO: jiekou: 当前模块 测试
-[2018-03-23 15:14:37.738645] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:37.739645] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:14:37.773647] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:http://www.tuling123.com/openapi/api ,返回:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}},预期:code=40001
-[2018-03-23 15:14:37.774647] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:14:37.774647] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:37.774647] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': 'code=40001', 'fanhuijson': {'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}}
-[2018-03-23 15:14:37.799648] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:http://www.tuling123.com/openapi/api
- ,返回:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}},预期:code=40002
-[2018-03-23 15:14:37.799648] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:14:37.799648] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:37.800648] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': 'code=40002', 'fanhuijson': {'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}}
-[2018-03-23 15:14:37.920655] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:https://api.douban.com/v2/photo/:id ,返回:{'code': 0, 'result': {'msg': 'uri_not_found', 'code': 1001, 'request': 'GET /v2/photo/:id'}},预期:
-[2018-03-23 15:14:37.920655] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:14:37.920655] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:37.920655] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': '', 'fanhuijson': {'code': 0, 'result': {'msg': 'uri_not_found', 'code': 1001, 'request': 'GET /v2/photo/:id'}}}
-[2018-03-23 15:14:37.920655] INFO: jiekou: 填写测试预期值
-[2018-03-23 15:14:37.964658] INFO: jiekou: 当前模块 保存测试结果
-[2018-03-23 15:14:37.965658] INFO: jiekou: 全部args参数参数信息 , (datetime.datetime(2018, 3, 23, 15, 14, 37, 729644), 3, 0, 2)
-[2018-03-23 15:14:37.965658] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:14:43.422970] INFO: jiekou: 当前模块 requests封装
-[2018-03-23 15:14:43.422970] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:43.423970] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:14:43.462972] INFO: jiekou: 当前模块 生成数据驱动所用数据
-[2018-03-23 15:14:43.462972] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:43.462972] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:14:43.463972] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-23 15:14:43.463972] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:43.463972] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-23 15:14:43.548977] INFO: jiekou: 测试用例开始执行
-[2018-03-23 15:14:43.548977] INFO: jiekou: 输入参数：url:http://www.tuling123.com/openapi/api,key:aaaa,参数:{'password':'1222'},请求方式：POST
-[2018-03-23 15:14:43.548977] INFO: jiekou: 输入参数：url:http://www.tuling123.com/openapi/api,key:aaaa,参数:{'password':'1222'},请求方式：None
-[2018-03-23 15:14:43.580979] INFO: jiekou: 返回结果:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}
-[2018-03-23 15:14:43.580979] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:14:43.580979] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:43.580979] INFO: jiekou: 全部kwargs参数信息 , {'asserqingwang': 'code=40001'}
-[2018-03-23 15:14:43.580979] INFO: jiekou: 测试用例执行完毕
-[2018-03-23 15:14:43.581979] INFO: jiekou: 测试用例开始执行
-[2018-03-23 15:14:43.581979] INFO: jiekou: 输入参数：url:http://www.tuling123.com/openapi/api
-,key:dfeb1cc8125943d29764a2f2f5c33739,参数:{'password':'1222'},请求方式：POST
-[2018-03-23 15:14:43.581979] INFO: jiekou: 输入参数：url:http://www.tuling123.com/openapi/api
-,key:dfeb1cc8125943d29764a2f2f5c33739,参数:{'password':'1222'},请求方式：None
-[2018-03-23 15:14:43.607981] INFO: jiekou: 返回结果:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}
-[2018-03-23 15:14:43.607981] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:14:43.607981] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:43.607981] INFO: jiekou: 全部kwargs参数信息 , {'asserqingwang': 'code=40002'}
-[2018-03-23 15:14:43.607981] INFO: jiekou: 测试用例执行完毕
-[2018-03-23 15:14:43.607981] INFO: jiekou: 测试用例开始执行
-[2018-03-23 15:14:43.608981] INFO: jiekou: 输入参数：url:https://api.douban.com/v2/photo/:id,key:dfeb1cc8125943d29764a2f2f5c33739,参数:{'password':'1222'},请求方式：GET
-[2018-03-23 15:14:43.608981] INFO: jiekou: 输入参数：url:https://api.douban.com/v2/photo/:id,key:dfeb1cc8125943d29764a2f2f5c33739,参数:{'password':'1222'},请求方式：None
-[2018-03-23 15:14:43.678985] INFO: jiekou: 返回结果:{'code': 0, 'result': {'msg': 'uri_not_found', 'code': 1001, 'request': 'GET /v2/photo/:id'}}
-[2018-03-23 15:14:43.678985] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:14:43.678985] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:43.678985] INFO: jiekou: 全部kwargs参数信息 , {'asserqingwang': ''}
-[2018-03-23 15:14:43.679985] INFO: jiekou: 填写测试预期值
-[2018-03-23 15:14:43.679985] INFO: jiekou: 测试用例执行完毕
diff --git a/log/jiekou-2018-03-29-13.log b/log/jiekou-2018-03-29-13.log
deleted file mode 100644
index a9260e1..0000000
--- a/log/jiekou-2018-03-29-13.log
+++ /dev/null
@@ -1,56 +0,0 @@
-[2018-03-29 13:00:14.587058] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-29 13:00:14.601059] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-29 13:00:14.601059] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-29 13:00:14.707065] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-29 13:00:14.707065] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-29 13:00:14.708065] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-29 13:00:14.711065] INFO: jiekou: 当前模块 dubbo接口测试
-[2018-03-29 13:00:14.711065] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-29 13:00:14.712065] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-29 13:00:53.118262] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-29 13:00:53.118262] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-29 13:00:53.119262] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-29 13:00:53.127262] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-29 13:00:53.127262] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-29 13:00:53.127262] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-29 13:00:53.131263] INFO: jiekou: 当前模块 dubbo接口测试
-[2018-03-29 13:00:53.131263] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-29 13:00:53.131263] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-29 13:07:03.557450] INFO: jiekou: 当前模块 requests封装
-[2018-03-29 13:07:03.558450] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-29 13:07:03.558450] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-29 13:07:03.575451] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-29 13:07:03.575451] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\jiekou-python3\\test_case\\case.xlsx',)
-[2018-03-29 13:07:03.575451] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-29 13:07:03.620453] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-29 13:07:03.621453] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-29 13:07:03.621453] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-29 13:07:44.560795] INFO: jiekou: 当前模块 requests封装
-[2018-03-29 13:07:44.560795] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-29 13:07:44.561795] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-29 13:07:44.571796] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-29 13:07:44.571796] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\jiekou-python3\\test_case\\case.xlsx',)
-[2018-03-29 13:07:44.571796] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-29 13:07:44.581796] INFO: jiekou: 当前模块 解析测试用例文件
-[2018-03-29 13:07:44.582796] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\jiekou-python3\\test_case\\case.xlsx',)
-[2018-03-29 13:07:44.582796] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-29 13:07:44.586797] INFO: jiekou: 当前模块 测试
-[2018-03-29 13:07:44.586797] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-29 13:07:44.586797] INFO: jiekou: 全部kwargs参数信息 , {}
-[2018-03-29 13:07:44.663801] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:http://www.tuling123.com/openapi/api ,返回:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}},预期:code=40001
-[2018-03-29 13:07:44.663801] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-29 13:07:44.664801] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-29 13:07:44.664801] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': 'code=40001', 'fanhuijson': {'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}}
-[2018-03-29 13:07:44.688802] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:http://www.tuling123.com/openapi/api
- ,返回:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}},预期:code=40002
-[2018-03-29 13:07:44.688802] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-29 13:07:44.688802] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-29 13:07:44.688802] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': 'code=40002', 'fanhuijson': {'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}}
-[2018-03-29 13:07:44.896814] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:https://api.douban.com/v2/photo/:id ,返回:{'code': 0, 'result': {'msg': 'uri_not_found', 'code': 1001, 'request': 'GET /v2/photo/:id'}},预期:
-[2018-03-29 13:07:44.896814] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-29 13:07:44.896814] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-29 13:07:44.897814] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': '', 'fanhuijson': {'code': 0, 'result': {'msg': 'uri_not_found', 'code': 1001, 'request': 'GET /v2/photo/:id'}}}
-[2018-03-29 13:07:44.897814] INFO: jiekou: 填写测试预期值
-[2018-03-29 13:07:45.329839] INFO: jiekou: 当前模块 保存测试结果
-[2018-03-29 13:07:45.330839] INFO: jiekou: 全部args参数参数信息 , (datetime.datetime(2018, 3, 29, 13, 7, 44, 581796), 3, 0, 2)
-[2018-03-29 13:07:45.330839] INFO: jiekou: 全部kwargs参数信息 , {}
diff --git a/run_dubbo_html.py b/run_dubbo_html.py
index 603304b..559ee76 100644
--- a/run_dubbo_html.py
+++ b/run_dubbo_html.py
@@ -4,8 +4,8 @@ import os,datetime,time
from testCase.dubbocase import testdubbointerface
from Public.py_Html import createHtml
from Public.get_excel import datacel
-from Public.create_report import save_result
-def stast():
+from Public.Dingtalk import send_ding
+def start_dubbo_case():
starttime=datetime.datetime.now()
day= time.strftime("%Y%m%d%H%M", time.localtime(time.time()))
basdir=os.path.abspath(os.path.dirname(__file__))
@@ -14,11 +14,12 @@ def stast():
filepath =os.path.join(basdir+'\\test_Report\\%s-result.html'%day)
if os.path.exists(filepath) is False:
os.system(r'touch %s' % filepath)
- save_result(starttime,len(listrelust),((list_pass)),list_fail)
endtime=datetime.datetime.now()
- createHtml(titles='dubbo接口测试报告',filepath=filepath,starttime=starttime,
+ createHtml(titles='dubbo接口自动化测试报告',filepath=filepath,starttime=starttime,
endtime=endtime,passge=list_pass,fail=list_fail,
id=listid,name=listname,key=listkey,coneent=listconeent,url=listurl,meth=listfangshi,
yuqi=listqiwang,json=list_json,relusts=listrelust,weizhi=list_weizhi,exceptions=list_exption)
+ contec='dubbo接口自动化测试完成，测试通过:%s,测试失败：%s，异常:%s,未知错误：%s,详情见：%s'%(list_pass,list_fail,list_exption,list_weizhi,filepath)
+ send_ding(content=contec)
if __name__ == '__main__':
- stast()
\ No newline at end of file
+ start_dubbo_case()
\ No newline at end of file
diff --git a/run_new.py b/run_http_ddt_case.py
similarity index 70%
rename from run_new.py
rename to run_http_ddt_case.py
index 2100c0a..ad12f30 100644
--- a/run_new.py
+++ b/run_http_ddt_case.py
@@ -3,6 +3,7 @@
from testCase.ddt_case import MyTest
import unittest,time,os
from Public import BSTestRunner
+from Public.Dingtalk import send_ding
if __name__=='__main__':
suite = unittest.TestSuite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(MyTest))
@@ -12,4 +13,6 @@ if __name__=='__main__':
file = os.path.join(file_dir, (now + '.html'))
re_open = open(file, 'wb')
runner = BSTestRunner.BSTestRunner(stream=re_open, title='http接口测试报告', description='测试结果')
- m=runner.run(suite)
\ No newline at end of file
+ m=runner.run(suite)
+ contec = 'http接口自动化测试完成，测试通过:%s,测试失败：%s，未知错误：%s,详情见：%s' % (m.success_count,m.failure_count, m.error_count,file)
+ send_ding(content=contec)
\ No newline at end of file
diff --git a/run_excel_re.py b/run_http_excel_re.py
similarity index 70%
rename from run_excel_re.py
rename to run_http_excel_re.py
index 747a78e..e4c26a2 100644
--- a/run_excel_re.py
+++ b/run_http_excel_re.py
@@ -1,27 +1,28 @@
# encoding: utf-8
"""
@author: lileilei
-@file: run_excel_re.py
+@file: run_http_excel_re.py
@time: 2017/6/9 12:45
"""
from Public.pyreport_excel import create
import os,datetime
+from Public.Dingtalk import send_ding
from testCase.case import testinterface
from Public.get_excel import datacel
-from Public.create_report import save_result
-def start():
- starttime=datetime.datetime.now()
+def start_excel_report_http():
m=datetime.datetime.now().strftime("%Y%m%d")
basdir = os.path.abspath(os.path.dirname(__file__))
- path = os.getcwd() + '\\test_case\\case.xlsx'
+ path = os.getcwd() + '\\test_case_data\\case.xlsx'
listid,listkey,listconeent,listurl,listfangshi,listqiwang,listname=datacel(path)
listrelust, list_fail, list_pass, list_json, list_exption, list_weizhi =testinterface()
filepath = os.path.join(basdir + '\\test_Report\\%s-result.xls'%m)
if os.path.exists(filepath) is False:
os.system(r'touch %s' % filepath)
- save_result(starttime, len(listrelust), ((list_pass)), list_fail)
create(filename=filepath,list_fail=list_fail, list_pass=list_pass, list_json=list_json, listurls=listurl,
listkeys=listkey,listconeents=listconeent, listfangshis=listfangshi, listqiwangs=listqiwang,
listids=listid, listrelust=listrelust, listnames=listname)
+ contec = 'dubbo接口自动化测试完成，测试通过:%s,测试失败：%s，异常:%s,未知错误：%s,详情见：%s' % (
+ list_pass, list_fail, list_exption, list_weizhi, filepath)
+ send_ding(content=contec)
if __name__ == '__main__':
- start()
\ No newline at end of file
+ start_excel_report_http()
\ No newline at end of file
diff --git a/run_html.py b/run_http_html.py
similarity index 68%
rename from run_html.py
rename to run_http_html.py
index 2b9c520..bf07698 100644
--- a/run_html.py
+++ b/run_http_html.py
@@ -4,22 +4,24 @@ import os,datetime,time
from testCase.case import testinterface
from Public.py_Html import createHtml
from Public.get_excel import datacel
-from Public.create_report import save_result
-def stast():
+from Public.Dingtalk import send_ding
+def start_interface_html_http():
starttime=datetime.datetime.now()
day= time.strftime("%Y%m%d%H%M", time.localtime(time.time()))
basdir=os.path.abspath(os.path.dirname(__file__))
- path = os.getcwd() + '\\test_case\\case.xlsx'
+ path = os.getcwd() + '\\test_case_data\\case.xlsx'
listid, listkey, listconeent, listurl, listfangshi, listqiwang, listname = datacel(path)
listrelust, list_fail, list_pass, list_json,list_exption,list_weizhi = testinterface()
filepath =os.path.join(basdir+'\\test_Report\\%s-result.html'%day)
if os.path.exists(filepath) is False:
os.system(r'touch %s' % filepath)
- save_result(starttime,len(listrelust),((list_pass)),list_fail)
endtime=datetime.datetime.now()
- createHtml(titles='接口测试报告',filepath=filepath,starttime=starttime,
+ createHtml(titles='http接口自动化测试报告',filepath=filepath,starttime=starttime,
endtime=endtime,passge=list_pass,fail=list_fail,
id=listid,name=listname,key=listkey,coneent=listconeent,url=listurl,meth=listfangshi,
yuqi=listqiwang,json=list_json,relusts=listrelust,weizhi=list_weizhi,exceptions=list_exption)
+ contec = 'http接口自动化测试完成，测试通过:%s,测试失败：%s，异常:%s,未知错误：%s,详情见：%s' % (
+ list_pass, list_fail, list_exption, list_weizhi, filepath)
+ send_ding(content=contec)
if __name__ == '__main__':
- stast()
\ No newline at end of file
+ start_interface_html_http()
\ No newline at end of file
diff --git a/test_Report/2018-0323.html b/test_Report/2018-0402.html
similarity index 83%
rename from test_Report/2018-0323.html
rename to test_Report/2018-0402.html
index ae3234a..dfe2035 100644
--- a/test_Report/2018-0323.html
+++ b/test_Report/2018-0402.html
@@ -5,7 +5,7 @@
- 接口测试报告
+ http接口测试报告
@@ -149,9 +149,9 @@ function showOutput(id, name) {
-
接口测试报告
-
Start Time: 2018-03-23 15:14:43
-
Duration: 0:00:00.144008
+
http接口测试报告
+
Start Time: 2018-04-02 10:53:02
+
Duration: 0:00:02.914166
Status: Pass 2 Error 1
测试结果
@@ -201,14 +201,14 @@ function showOutput(id, name) {
-pt1.1: [2018-03-23 15:14:43.548977] INFO: jiekou: 测试用例开始执行
-[2018-03-23 15:14:43.548977] INFO: jiekou: 输入参数：url:http://www.tuling123.com/openapi/api,key:aaaa,参数:{'password':'1222'},请求方式：POST
-[2018-03-23 15:14:43.548977] INFO: jiekou: 输入参数：url:http://www.tuling123.com/openapi/api,key:aaaa,参数:{'password':'1222'},请求方式：None
-[2018-03-23 15:14:43.580979] INFO: jiekou: 返回结果:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}
-[2018-03-23 15:14:43.580979] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:14:43.580979] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:43.580979] INFO: jiekou: 全部kwargs参数信息 , {'asserqingwang': 'code=40001'}
-[2018-03-23 15:14:43.580979] INFO: jiekou: 测试用例执行完毕
+pt1.1: [2018-04-02 10:53:02.332375] INFO: jiekou: 测试用例开始执行
+[2018-04-02 10:53:02.332375] INFO: jiekou: 输入参数：url:http://www.tuling123.com/openapi/api,key:aaaa,参数:{'password':'1222'},请求方式：POST
+[2018-04-02 10:53:02.332375] INFO: jiekou: 输入参数：url:http://www.tuling123.com/openapi/api,key:aaaa,参数:{'password':'1222'},请求方式：None
+[2018-04-02 10:53:02.364376] INFO: jiekou: 返回结果:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}
+[2018-04-02 10:53:02.364376] INFO: jiekou: 当前模块 断言测试结果
+[2018-04-02 10:53:02.364376] INFO: jiekou: 全部args参数参数信息 , ()
+[2018-04-02 10:53:02.364376] INFO: jiekou: 全部kwargs参数信息 , {'asserqingwang': 'code=40001'}
+[2018-04-02 10:53:02.364376] INFO: jiekou: 测试用例执行完毕
@@ -233,16 +233,16 @@ pt1.1: [2018-03-23 15:14:43.548977] INFO: jiekou: 测试用例开始执行
-pt1.2: [2018-03-23 15:14:43.581979] INFO: jiekou: 测试用例开始执行
-[2018-03-23 15:14:43.581979] INFO: jiekou: 输入参数：url:http://www.tuling123.com/openapi/api
+pt1.2: [2018-04-02 10:53:02.364376] INFO: jiekou: 测试用例开始执行
+[2018-04-02 10:53:02.364376] INFO: jiekou: 输入参数：url:http://www.tuling123.com/openapi/api
,key:dfeb1cc8125943d29764a2f2f5c33739,参数:{'password':'1222'},请求方式：POST
-[2018-03-23 15:14:43.581979] INFO: jiekou: 输入参数：url:http://www.tuling123.com/openapi/api
+[2018-04-02 10:53:02.365376] INFO: jiekou: 输入参数：url:http://www.tuling123.com/openapi/api
,key:dfeb1cc8125943d29764a2f2f5c33739,参数:{'password':'1222'},请求方式：None
-[2018-03-23 15:14:43.607981] INFO: jiekou: 返回结果:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}
-[2018-03-23 15:14:43.607981] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:14:43.607981] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:43.607981] INFO: jiekou: 全部kwargs参数信息 , {'asserqingwang': 'code=40002'}
-[2018-03-23 15:14:43.607981] INFO: jiekou: 测试用例执行完毕
+[2018-04-02 10:53:02.390378] INFO: jiekou: 返回结果:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}
+[2018-04-02 10:53:02.390378] INFO: jiekou: 当前模块 断言测试结果
+[2018-04-02 10:53:02.390378] INFO: jiekou: 全部args参数参数信息 , ()
+[2018-04-02 10:53:02.390378] INFO: jiekou: 全部kwargs参数信息 , {'asserqingwang': 'code=40002'}
+[2018-04-02 10:53:02.390378] INFO: jiekou: 测试用例执行完毕
@@ -267,19 +267,19 @@ pt1.2: [2018-03-23 15:14:43.581979] INFO: jiekou: 测试用例开始执行
-ft1.3: [2018-03-23 15:14:43.607981] INFO: jiekou: 测试用例开始执行
-[2018-03-23 15:14:43.608981] INFO: jiekou: 输入参数：url:https://api.douban.com/v2/photo/:id,key:dfeb1cc8125943d29764a2f2f5c33739,参数:{'password':'1222'},请求方式：GET
-[2018-03-23 15:14:43.608981] INFO: jiekou: 输入参数：url:https://api.douban.com/v2/photo/:id,key:dfeb1cc8125943d29764a2f2f5c33739,参数:{'password':'1222'},请求方式：None
-[2018-03-23 15:14:43.678985] INFO: jiekou: 返回结果:{'code': 0, 'result': {'msg': 'uri_not_found', 'code': 1001, 'request': 'GET /v2/photo/:id'}}
-[2018-03-23 15:14:43.678985] INFO: jiekou: 当前模块 断言测试结果
-[2018-03-23 15:14:43.678985] INFO: jiekou: 全部args参数参数信息 , ()
-[2018-03-23 15:14:43.678985] INFO: jiekou: 全部kwargs参数信息 , {'asserqingwang': ''}
-[2018-03-23 15:14:43.679985] INFO: jiekou: 填写测试预期值
-[2018-03-23 15:14:43.679985] INFO: jiekou: 测试用例执行完毕
+ft1.3: [2018-04-02 10:53:02.391378] INFO: jiekou: 测试用例开始执行
+[2018-04-02 10:53:02.391378] INFO: jiekou: 输入参数：url:https://api.douban.com/v2/photo/:id,key:dfeb1cc8125943d29764a2f2f5c33739,参数:{'password':'1222'},请求方式：GET
+[2018-04-02 10:53:02.391378] INFO: jiekou: 输入参数：url:https://api.douban.com/v2/photo/:id,key:dfeb1cc8125943d29764a2f2f5c33739,参数:{'password':'1222'},请求方式：None
+[2018-04-02 10:53:05.242541] INFO: jiekou: 返回结果:{'code': 0, 'result': {'msg': 'uri_not_found', 'code': 1001, 'request': 'GET /v2/photo/:id'}}
+[2018-04-02 10:53:05.242541] INFO: jiekou: 当前模块 断言测试结果
+[2018-04-02 10:53:05.243541] INFO: jiekou: 全部args参数参数信息 , ()
+[2018-04-02 10:53:05.243541] INFO: jiekou: 全部kwargs参数信息 , {'asserqingwang': ''}
+[2018-04-02 10:53:05.243541] INFO: jiekou: 填写测试预期值
+[2018-04-02 10:53:05.243541] INFO: jiekou: 测试用例执行完毕
Traceback (most recent call last):
File "C:\Users\Administrator\AppData\Roaming\Python\Python36\site-packages\ddt.py", line 139, in wrapper
return func(self, *args, **kwargs)
- File "C:\Users\Administrator\Desktop\jiekou-python3\testCase\ddt_case.py", line 19, in test_api
+ File "C:\Users\Administrator\Desktop\jiekou-python3\testCase\ddt_case.py", line 24, in test_api
qingwang=assertre(asserqingwang=data_test['qiwang'])
File "C:\Users\Administrator\Desktop\jiekou-python3\Public\log.py", line 33, in _wrap
return function(*args, **kwargs)
diff --git a/test_case/case.xlsx b/test_case_data/case.xlsx
similarity index 100%
rename from test_case/case.xlsx
rename to test_case_data/case.xlsx
diff --git a/test_case/dubbocase.xlsx b/test_case_data/dubbocase.xlsx
similarity index 100%
rename from test_case/dubbocase.xlsx
rename to test_case_data/dubbocase.xlsx