fix: CSV relative path detection

This commit is contained in:
debugtalk
2019-03-07 17:47:23 +08:00
parent 50e3a6e263
commit 3b60fb8985
3 changed files with 13 additions and 1 deletions

View File

@@ -1,7 +1,7 @@
__title__ = 'HttpRunner' __title__ = 'HttpRunner'
__description__ = 'One-stop solution for HTTP(S) testing.' __description__ = 'One-stop solution for HTTP(S) testing.'
__url__ = 'https://github.com/HttpRunner/HttpRunner' __url__ = 'https://github.com/HttpRunner/HttpRunner'
__version__ = '2.0.5' __version__ = '2.0.6'
__author__ = 'debugtalk' __author__ = 'debugtalk'
__author_email__ = 'mail@debugtalk.com' __author_email__ = 'mail@debugtalk.com'
__license__ = 'Apache-2.0' __license__ = 'Apache-2.0'

View File

@@ -50,6 +50,9 @@ class VariableNotFound(NotFoundError):
class EnvNotFound(NotFoundError): class EnvNotFound(NotFoundError):
pass pass
class CSVNotFound(NotFoundError):
pass
class ApiNotFound(NotFoundError): class ApiNotFound(NotFoundError):
pass pass

View File

@@ -80,6 +80,15 @@ def load_csv_file(csv_file):
] ]
""" """
if not os.path.isabs(csv_file):
project_working_directory = tests_def_mapping["PWD"] or os.getcwd()
# make compatible with Windows/Linux
csv_file = os.path.join(project_working_directory, *csv_file.split("/"))
if not os.path.isfile(csv_file):
# file path not exist
raise exceptions.CSVNotFound(csv_file)
csv_content_list = [] csv_content_list = []
with io.open(csv_file, encoding='utf-8') as csvfile: with io.open(csv_file, encoding='utf-8') as csvfile: