Skip to content

Commit

Permalink
修复部分bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@liwanlei
liwanlei committed Apr 12, 2018
1 parent 6330a2a commit e9838cd
Show file tree
Hide file tree
Showing 15 changed files with 180 additions and 752 deletions.
732 changes: 0 additions & 732 deletions .idea/workspace.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Interface/testFengzhuang.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @Author : lileilei
# @Site :
# @File : testFengzhuang.py
from Interface.test_requests import requ
from Public.test_requests import requ
reques=requ()
class TestApi(object):
def __init__(self,url,key,connent,fangshi):
Expand Down
25 changes: 25 additions & 0 deletions Public/Dingtalk.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
"""
@author: lileilei
@file: Dingtalk.py
@time: 2017/12/26 17:34
"""
'''封装钉钉群发消息'''
import requests,json
from config.config_dingding import Dingtalk_access_token
def send_ding(content):
url = Dingtalk_access_token
pagrem = {
"msgtype": "text",
"text": {
"content": content
},
"isAtAll": True
}
headers = {
'Content-Type': 'application/json'
}
f = requests.post(url, data=json.dumps(pagrem), headers=headers)
if f.status_code==200:
return True
else:
return False
0 Interface/test_requests.py → Public/test_requests.py
View file
File renamed without changes.
12 changes: 2 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# 接口测试框架（基于json格式、http请求,python3,不兼容python2.x版本）
<<<<<<< HEAD
## 新增对dubbo接口的支持，由于当前调试的问题，暂时没有调试，详情可见dubbo分支。
# 接口测试框架（基于json格式、http协议，dubbo协议请求,python3,不兼容python2.x版本）

=======
# 支持对dubbo接口测试的相关内容，暂时存放在dubbo分支。
>>>>>>> dubbo
## 注：现在基于Excel文件管理测试用例基本实现,)
# 2018-3-13版本修改
### 原来的测试报告更加详细的展示错误类型，对部分代码进行了优化，断言结果返回更加详细，更快的定位测试问题
Expand Down Expand Up @@ -44,7 +39,4 @@
![Alt text](https://github.com/liwanlei/jiekou/blob/master/img/excel.png)
![Alt text](https://github.com/liwanlei/jiekou/blob/master/img/excel2.png)
### 现在的测试结构更加完整，最新的一次提交增加了log日志的展示，使功能更加完善，log日志在控制台展示如下，对目录进行优化
![Alt text](https://github.com/liwanlei/jiekou/blob/master/img/log.png)



![Alt text](https://github.com/liwanlei/jiekou/blob/master/img/log.png)
5 changes: 5 additions & 0 deletions config/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"""
@author: lileilei
@file: __init__.py
@time: 2018/4/12 14:17
"""
6 changes: 6 additions & 0 deletions config/config_dingding.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
"""
@author: lileilei
@file: config_dingding.py
@time: 2018/4/12 14:17
"""
Dingtalk_access_token=""
131 changes: 131 additions & 0 deletions log/jiekou-2018-04-12-14.log
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
[2018-04-12 14:14:47.902256] INFO: jiekou: 当前模块 requests封装
[2018-04-12 14:14:47.916257] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:14:47.916257] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:14:48.166271] INFO: jiekou: 当前模块 生成数据驱动所用数据
[2018-04-12 14:14:48.167271] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:14:48.167271] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:14:48.167271] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:14:48.167271] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case\\case.xlsx',)
[2018-04-12 14:14:48.167271] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:14:48.167271] INFO: jiekou: 打开测试用例失败，原因是:<class 'Exception'>
[2018-04-12 14:15:16.884914] INFO: jiekou: 当前模块 requests封装
[2018-04-12 14:15:16.884914] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:15:16.884914] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:15:16.894914] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:15:16.895914] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case\\case.xlsx',)
[2018-04-12 14:15:16.895914] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:15:16.895914] INFO: jiekou: 打开测试用例失败，原因是:<class 'Exception'>
[2018-04-12 14:16:01.084442] INFO: jiekou: 当前模块 requests封装
[2018-04-12 14:16:01.085442] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:16:01.085442] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:16:01.099442] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:16:01.100443] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case\\case.xlsx',)
[2018-04-12 14:16:01.100443] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:16:01.100443] INFO: jiekou: 打开测试用例失败，原因是:<class 'Exception'>
[2018-04-12 14:16:03.536582] INFO: jiekou: 当前模块 requests封装
[2018-04-12 14:16:03.537582] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:16:03.537582] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:16:03.547583] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:16:03.547583] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case\\case.xlsx',)
[2018-04-12 14:16:03.547583] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:16:03.548583] INFO: jiekou: 打开测试用例失败，原因是:<class 'Exception'>
[2018-04-12 14:16:05.210678] INFO: jiekou: 当前模块 requests封装
[2018-04-12 14:16:05.211678] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:16:05.211678] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:16:05.221678] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:16:05.221678] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case\\case.xlsx',)
[2018-04-12 14:16:05.221678] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:16:05.221678] INFO: jiekou: 打开测试用例失败，原因是:<class 'Exception'>
[2018-04-12 14:16:06.842771] INFO: jiekou: 当前模块 requests封装
[2018-04-12 14:16:06.843771] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:16:06.843771] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:16:06.854772] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:16:06.854772] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case\\case.xlsx',)
[2018-04-12 14:16:06.854772] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:16:06.854772] INFO: jiekou: 打开测试用例失败，原因是:<class 'Exception'>
[2018-04-12 14:16:08.608872] INFO: jiekou: 当前模块 requests封装
[2018-04-12 14:16:08.609872] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:16:08.609872] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:16:08.619873] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:16:08.620873] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case\\case.xlsx',)
[2018-04-12 14:16:08.620873] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:16:08.620873] INFO: jiekou: 打开测试用例失败，原因是:<class 'Exception'>
[2018-04-12 14:16:33.525297] INFO: jiekou: 当前模块 requests封装
[2018-04-12 14:16:33.526297] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:16:33.526297] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:16:33.538298] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:16:33.538298] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case_data\\case.xlsx',)
[2018-04-12 14:16:33.538298] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:18:09.201770] INFO: jiekou: 当前模块 requests封装
[2018-04-12 14:18:09.201770] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:18:09.201770] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:18:09.212770] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:18:09.212770] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case_data\\case.xlsx',)
[2018-04-12 14:18:09.212770] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:18:09.249772] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:18:09.249772] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case_data\\case.xlsx',)
[2018-04-12 14:18:09.249772] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:18:09.253772] INFO: jiekou: 当前模块 测试
[2018-04-12 14:18:09.253772] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:18:09.253772] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:18:09.344778] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:http://www.tuling123.com/openapi/api ,返回:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}},预期:code=40001
[2018-04-12 14:18:09.344778] INFO: jiekou: 当前模块 断言测试结果
[2018-04-12 14:18:09.344778] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:18:09.344778] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': 'code=40001', 'fanhuijson': {'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}}
[2018-04-12 14:18:09.369779] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:http://www.tuling123.com/openapi/api
,返回:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}},预期:code=40002
[2018-04-12 14:18:09.369779] INFO: jiekou: 当前模块 断言测试结果
[2018-04-12 14:18:09.369779] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:18:09.369779] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': 'code=40002', 'fanhuijson': {'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}}
[2018-04-12 14:18:09.619793] 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-04-12 14:18:09.619793] INFO: jiekou: 当前模块 断言测试结果
[2018-04-12 14:18:09.619793] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:18:09.619793] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': '', 'fanhuijson': {'code': 0, 'result': {'msg': 'uri_not_found', 'code': 1001, 'request': 'GET /v2/photo/:id'}}}
[2018-04-12 14:18:09.620793] INFO: jiekou: 填写测试预期值
[2018-04-12 14:19:46.871356] INFO: jiekou: 当前模块 requests封装
[2018-04-12 14:19:46.871356] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:19:46.872356] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:19:46.882357] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:19:46.882357] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case_data\\case.xlsx',)
[2018-04-12 14:19:46.882357] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:19:46.892357] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:19:46.893357] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case_data\\case.xlsx',)
[2018-04-12 14:19:46.893357] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:19:46.896357] INFO: jiekou: 当前模块 测试
[2018-04-12 14:19:46.896357] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:19:46.896357] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:19:46.934359] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:http://www.tuling123.com/openapi/api ,返回:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}},预期:code=40001
[2018-04-12 14:19:46.935360] INFO: jiekou: 当前模块 断言测试结果
[2018-04-12 14:19:46.935360] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:19:46.935360] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': 'code=40001', 'fanhuijson': {'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}}
[2018-04-12 14:19:46.962361] INFO: jiekou: inputdata> 参数:{'password':'1222'}, url:http://www.tuling123.com/openapi/api
,返回:{'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}},预期:code=40002
[2018-04-12 14:19:46.963361] INFO: jiekou: 当前模块 断言测试结果
[2018-04-12 14:19:46.963361] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:19:46.963361] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': 'code=40002', 'fanhuijson': {'code': 0, 'result': {'code': 40007, 'text': '您的请求内容为空。'}}}
[2018-04-12 14:19:47.043366] 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-04-12 14:19:47.043366] INFO: jiekou: 当前模块 断言测试结果
[2018-04-12 14:19:47.043366] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:19:47.044366] INFO: jiekou: 全部kwargs参数信息 , {'asserqiwang': '', 'fanhuijson': {'code': 0, 'result': {'msg': 'uri_not_found', 'code': 1001, 'request': 'GET /v2/photo/:id'}}}
[2018-04-12 14:19:47.044366] INFO: jiekou: 填写测试预期值
[2018-04-12 14:20:09.075626] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:20:09.076626] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case_data\\dubbocase.xlsx',)
[2018-04-12 14:20:09.076626] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:20:09.268637] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:20:09.268637] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:20:09.268637] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:21:10.014111] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:21:10.015111] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case_data\\dubbocase.xlsx',)
[2018-04-12 14:21:10.015111] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:21:10.195122] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:21:10.196122] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:21:10.196122] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:21:20.072687] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:21:20.072687] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case_data\\dubbocase.xlsx',)
[2018-04-12 14:21:20.073687] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:21:20.250697] INFO: jiekou: 当前模块 解析测试用例文件
[2018-04-12 14:21:20.251697] INFO: jiekou: 全部args参数参数信息 , ('C:\\Users\\Administrator\\Desktop\\xuesheng\\jiekou-python3\\test_case_data\\dubbocase.xlsx',)
[2018-04-12 14:21:20.251697] INFO: jiekou: 全部kwargs参数信息 , {}
[2018-04-12 14:21:20.255697] INFO: jiekou: 当前模块 dubbo接口测试
[2018-04-12 14:21:20.255697] INFO: jiekou: 全部args参数参数信息 , ()
[2018-04-12 14:21:20.255697] INFO: jiekou: 全部kwargs参数信息 , {}
3 changes: 2 additions & 1 deletion run_dubbo_html.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ 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__))
listid, listkey, listconeent, listurl, listfangshi, listqiwang, listname = datacel()
path = os.getcwd() + '\\test_case_data\\dubbocase.xlsx'
listid, listkey, listconeent, listurl, listfangshi, listqiwang, listname = datacel(path)
listrelust, list_fail, list_pass, list_json,list_exption,list_weizhi = testdubbointerface()
filepath =os.path.join(basdir+'\\test_Report\\%s-result.html'%day)
if os.path.exists(filepath) is False:
Expand Down
4 changes: 2 additions & 2 deletions testCase/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# @Time : 2017/6/4 20:15
# @Author : lileilei
# @File : case.py
from Interface.testFengzhuang import TestApi
from Interface.testFengzhuang import TestApi
from Public.get_excel import datacel
from Public.log import LOG,logger
import os
path=os.getcwd()+'\\test_case\\case.xlsx'
path=os.getcwd()+'\\test_case_data\\case.xlsx'
listid,listkey,listconeent,listurl,listfangshi,listqiwang,listname=datacel(path)
from Public.panduan import assert_in
@logger('测试')
Expand Down
2 changes: 1 addition & 1 deletion testCase/ddt_case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@file: dubbocase.py
@time: 2018/3/29 12:47
"""
from Interface.testFengzhuang import TestApi
from Interface.testFengzhuang import TestApi
from Public.get_excel import makedata
from Public.log import LOG
from Public.panduan import assertre
Expand Down
2 changes: 1 addition & 1 deletion testCase/dubbocase.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from Public.panduan import assert_in
from Public.get_excel import datacel
import os
path=os.getcwd()+'\\test_case\\dubbocase.xlsx'
path=os.getcwd()+'\\test_case_data\\dubbocase.xlsx'
listid,listurl,listinterface,listmeth,listfobject,listparam,listassert=datacel(path)
@logger('dubbo接口测试')
def testdubbointerface():
Expand Down
0 test_Report/20180323-result.xls → test_Report/20180412-result.xls
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions test_Report/201803291307-result.html → test_Report/201804121418-result.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>接口测试报告</title>
<title>http接口自动化测试报告</title>
<style type="text/css">
td{ width:40px; height:50px;}
</style>
Expand All @@ -11,9 +11,9 @@

<div style='width: 1170px;margin-left: 15%'>
<h1>接口测试的结果</h1>
<p><strong>开始时间:</strong> 2018-03-29 13:07:44.581796</p>
<p><strong>结束时间:</strong> 2018-03-29 13:07:45.333839</p>
<p><strong>耗时:</strong> 0:00:00.752043</p>
<p><strong>开始时间:</strong> 2018-04-12 14:18:09.248772</p>
<p><strong>结束时间:</strong> 2018-04-12 14:18:09.756801</p>
<p><strong>耗时:</strong> 0:00:00.508029</p>
<p><strong>结果:</strong>
<span >Pass: <strong >0</strong>
Fail: <strong >2</strong>
Expand Down
Binary file modified test_case_data/case.xlsx
View file
Binary file not shown.

0 comments on commit e9838cd

Please sign in to comment.