Commit 8fc8d8d4 by zh

upate conftest.py and read_excel.py

parent ae1c8687
...@@ -31,7 +31,7 @@ class ReadExcel: ...@@ -31,7 +31,7 @@ class ReadExcel:
self.ws = wb[self.ini.get_table_name(TABLE_NAME_KEY)] self.ws = wb[self.ini.get_table_name(TABLE_NAME_KEY)]
@log_decorator @log_decorator
def __get_cell_value(self, column: str, row: int) -> str|None: def __get_cell_value(self, column, row):
"""根据行或列,获取指定单元格数据""" """根据行或列,获取指定单元格数据"""
cell_value = self.ws[column + str(row)].value cell_value = self.ws[column + str(row)].value
if isinstance(cell_value, str) and len(cell_value.strip()) > 0: if isinstance(cell_value, str) and len(cell_value.strip()) > 0:
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
def pytest_collection_modifyitems(items): # def pytest_collection_modifyitems(items):
# item表示每个测试用例,解决用例名称中文显示问题 # # item表示每个测试用例,解决用例名称中文显示问题
for item in items: # for item in items:
item.name = item.name.encode("utf-8").decode("unicode-escape") # item.name = item.name.encode("utf-8").decode("unicode-escape")
item._nodeid = item._nodeid.encode("utf-8").decode("unicode-escape") # item._nodeid = item._nodeid.encode("utf-8").decode("unicode-escape")
\ No newline at end of file \ 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