From 38364e896028c1e9931909efba2119c66339113e Mon Sep 17 00:00:00 2001 From: debugtalk Date: Mon, 15 Jun 2020 15:06:33 +0800 Subject: [PATCH] fix: avoid '.csv' been converted to '_csv' --- docs/CHANGELOG.md | 6 ++++++ httprunner/utils.py | 8 ++++++-- tests/utils_test.py | 3 ++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 8a95a93d..a58035c6 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,11 @@ # Release History +## 3.0.13 (2020-06-15) + +**Fixed** + +- fix: avoid '.csv' been converted to '_csv' + ## 3.0.12 (2020-06-14) **Fixed** diff --git a/httprunner/utils.py b/httprunner/utils.py index 48da026a..d62b031f 100644 --- a/httprunner/utils.py +++ b/httprunner/utils.py @@ -210,8 +210,12 @@ def ensure_file_path_valid(file_path: Text) -> Text: # 19 => T19, 2C => T2C name = f"T{name}" - # handle cases when directory name includes dot/hyphen/space - name = name.replace(" ", "_").replace(".", "_").replace("-", "_") + if name.startswith("."): + # avoid ".csv" been converted to "_csv" + pass + else: + # handle cases when directory name includes dot/hyphen/space + name = name.replace(" ", "_").replace(".", "_").replace("-", "_") path_names.append(name) diff --git a/tests/utils_test.py b/tests/utils_test.py index df213a54..e95aa412 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -130,7 +130,8 @@ class TestUtils(unittest.TestCase): ensure_file_path_valid(os.getcwd()), os.getcwd(), ) self.assertEqual( - ensure_file_path_valid(os.getcwd() + ".csv"), os.getcwd() + ".csv", + ensure_file_path_valid(os.path.join(os.getcwd(), "demo", ".csv")), + os.path.join(os.getcwd(), "demo", ".csv"), ) def test_safe_dump_json(self):