diff --git a/.idea/api_excel.iml b/.idea/api_excel.iml
index 6711606..de638f1 100644
--- a/.idea/api_excel.iml
+++ b/.idea/api_excel.iml
@@ -4,6 +4,8 @@
+
+
diff --git a/case/api_test.xlsx b/case/api_test.xlsx
index 222fa01..e0ebf6f 100644
Binary files a/case/api_test.xlsx and b/case/api_test.xlsx differ
diff --git a/case/test_api.py b/case/test_api.py
index ab9d0ba..652c43a 100644
--- a/case/test_api.py
+++ b/case/test_api.py
@@ -7,6 +7,7 @@
from util import base_api
from util import readexcel
from util import writeexcel
+from util.logger import Logger
root_path = BaseUtil().get_root_path()
test_xlsx = root_path + "/case/api_test.xlsx"
@@ -14,6 +15,8 @@
test_data = readexcel.ExcelUtil(test_xlsx).dict_data()
+logger = Logger(logger="testapi").get_log()
+
@ddt.ddt
class TestAPI(unittest.TestCase):
@@ -23,28 +26,27 @@ def setUpClass(cls):
writeexcel.copy_excel(test_xlsx, report_xlsx)
def setUp(self):
- pass
+ logger.info("One testcase test start ...")
@ddt.data(*test_data)
def test_api(self, data):
res = base_api.send_requests(self.s, data)
-
- base_api.write_result(res, report_xlsx)
# checkpoint
check = data["CheckPoint"]
- print("checkpoint->:%s" % check)
+ logger.info("checkpoint->:%s" % check)
# return result
res_text = res["text"]
- print("result->:%s" % res_text)
+ logger.info("result->:%s" % res_text)
# Assert
self.assertTrue(check in res_text)
+ base_api.write_result(res, report_xlsx)
def tearDown(self):
- pass
+ logger.info("The testcase execute finish ...")
@classmethod
def tearDownClass(cls):
- pass
+ logger.info("All of the case done")
if __name__ == "__main__":
diff --git a/logs/2018-09-05_16_51_55.log b/logs/2018-09-05_16_51_55.log
deleted file mode 100644
index 6419f55..0000000
--- a/logs/2018-09-05_16_51_55.log
+++ /dev/null
@@ -1,6 +0,0 @@
-2018-09-05 16:51:55,886 - INFO - invalid syntax (, line 1)
-2018-09-05 16:51:55,886 - INFO - unexpected EOF while parsing (, line 0)
-2018-09-05 16:51:55,887 - INFO - unexpected EOF while parsing (, line 0)
-2018-09-05 16:51:56,175 - INFO - invalid syntax (, line 1)
-2018-09-05 16:51:56,175 - INFO - unexpected EOF while parsing (, line 0)
-2018-09-05 16:51:56,176 - INFO - unexpected EOF while parsing (, line 0)
diff --git a/util/base_api.py b/util/base_api.py
index a2523d0..8b2e383 100644
--- a/util/base_api.py
+++ b/util/base_api.py
@@ -8,26 +8,26 @@
def send_requests(s, test_data):
- method = test_data["Method"]
+ case_id = test_data['Id']
url = test_data["Url"]
+ method = test_data["Method"]
+ logger.info("*******Test Case :----- %s ----**********" % case_id)
+ logger.info("Request Method:%s, 请求url:%s" % (method, url))
+
try:
- params = eval(test_data["Parameters"])
+ params = test_data["Parameters"]
except Exception as e:
params = None
logger.info(e)
# 请求头部headers
try:
- headers = eval(test_data["Header"])
+ headers = test_data["Header"]
logger.info("Request Header:%s" % headers)
except Exception as e:
headers = None
logger.info(e)
# post请求body类型
data_type = test_data["Type"]
-
- test_nub = test_data['Id']
- logger.info("*******Test Case :----- %s ----**********" % test_nub)
- logger.info("Request Method:%s, 请求url:%s" % (method, url))
logger.info("Request Params:%s" % params)
# post请求body内容
@@ -70,18 +70,19 @@ def send_requests(s, test_data):
response["Msg"] = ""
if test_data["CheckPoint"] in response["text"]:
response["Result"] = "Pass"
- logger.info("Test Result: %s---->%s" % (test_nub, response["Result"]))
+ logger.info("Test Result: %s---->%s" % (case_id, response["Result"]))
else:
response["Result"] = "Fail"
return response
except Exception as msg:
- response["Msg"] = str(msg)
+ response["Msg"] = msg
return response
def write_result(result, filename):
# Return row_nub
row_nub = result['rowNum']
+ logger.info(row_nub)
# Write Result
wt = WriteExcel(filename)
wt.write(row_nub, 8, result['StatusCode']) # 写入返回状态码statuscode,第8列
diff --git a/util/baseutil.py b/util/baseutil.py
index dd08dc3..990cbc7 100644
--- a/util/baseutil.py
+++ b/util/baseutil.py
@@ -8,7 +8,7 @@
class BaseUtil:
def __init__(self):
- self.root_path = '/Users/admin/PycharmProjects/api_excel'
+ self.root_path = 'E:/PycharmProjects/api_excel'
def set_root_path(self, path):
"""设置项目的主path"""