Commit ccdd341b by jiaqiying
parents 1060280a 31746434
...@@ -8,23 +8,39 @@ def get_excelData(sheetName,caseName): ...@@ -8,23 +8,39 @@ def get_excelData(sheetName,caseName):
""" """
:param sheetName: sheet表名 :param sheetName: sheet表名
:param caseName: 从excle中第一列关键字(字母) :param caseName: 从excle中第一列关键字(字母)
:return: # [({参数},{期望}),({},{}),({},{})] :return: # [{},{},{}]
""" """
workSheet = workBook.sheet_by_name(sheetName) workSheet = workBook.sheet_by_name(sheetName)
list_title = workSheet.row_values(0)
lis = []
idx = 0
try: try:
for one in workSheet.col_values(0): num_url = list_title.index('url')
result = ''.join(re.findall(r'[A-Za-z]', one)) # 抽取字母字符串 num_headers = list_title.index('headers')
if caseName == result: num_method = list_title.index('method')
url= workSheet.cell_value(idx, 5) num_reqData = list_title.index('reqData')
headers= workSheet.cell_value(idx, 8) num_expectData = list_title.index('expectData')
colData = workSheet.cell_value(idx, 9) lis = []
colexpect = workSheet.cell_value(idx, 11) dict0 = {"url": "", "headers": "", "method": "", "reqData": "", "expectData": ""}
lis.append((json.loads(colData), json.loads(colexpect))) # 如果读取excle想获取字典,表中就必须是json字符串 idx = 0
idx += 1 try:
return lis for one in workSheet.col_values(0):
result = ''.join(re.findall(r'[A-Za-z]', one)) # 抽取字母字符串
if caseName == result:
dict0['url'] = workSheet.cell_value(idx, num_url)
dict0['headers'] = workSheet.cell_value(idx, num_headers)
dict0['method'] = workSheet.cell_value(idx, num_method)
dict0['data'] = workSheet.cell_value(idx, num_reqData)
dict0['expected'] = workSheet.cell_value(idx, num_expectData)
# json字符串转换成字典
dict0['reqData'] = json.loads(dict0['reqData'])
dict0['expectData'] = json.loads(dict0['expectData'])
dict0['headers'] = json.loads(dict0['expectData'])
lis.append(dict0)
idx += 1
return lis
except:
print("excle中header值或参数或期望不是json字符串")
except: except:
print("excle中参数和期望不是 json字符串") print("检查excle中标题是否正确")
\ No newline at end of file
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