From 73479bc63238e21189a754d9457a62998ee2a291 Mon Sep 17 00:00:00 2001 From: funilrys Date: Fri, 10 Jul 2020 01:04:44 +0200 Subject: [PATCH 1/3] Fix directory separtor under Windows. This patch fix #1332. --- testUpdateHostsFile.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testUpdateHostsFile.py b/testUpdateHostsFile.py index 62616dbc9..c957e3bb2 100644 --- a/testUpdateHostsFile.py +++ b/testUpdateHostsFile.py @@ -8,6 +8,7 @@ import json import locale import os +import platform import re import shutil import sys @@ -62,6 +63,8 @@ class Base(unittest.TestCase): @property def sep(self): + if platform.system().lower() == "windows": + return "\\" return os.sep def assert_called_once(self, mock_method): From b8b067b6abadfe92a0335099e87aa5ff0d53baf0 Mon Sep 17 00:00:00 2001 From: funilrys Date: Mon, 13 Jul 2020 11:29:11 +0200 Subject: [PATCH 2/3] Replace the returned separator under Windows. --- testUpdateHostsFile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testUpdateHostsFile.py b/testUpdateHostsFile.py index 1fb72993b..17c6edcb6 100644 --- a/testUpdateHostsFile.py +++ b/testUpdateHostsFile.py @@ -64,7 +64,7 @@ class Base(unittest.TestCase): @property def sep(self): if platform.system().lower() == "windows": - return "\\" + return "/" return os.sep def assert_called_once(self, mock_method): From abf763e9a0a9c93749f8b52aa2543a85feda9462 Mon Sep 17 00:00:00 2001 From: funilrys Date: Mon, 13 Jul 2020 15:34:28 +0200 Subject: [PATCH 3/3] Change strategy regarding #1332. Instead of changing the directory separator globally, we change it only when we generate/update the readme data file. --- testUpdateHostsFile.py | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/testUpdateHostsFile.py b/testUpdateHostsFile.py index 17c6edcb6..57a21f239 100644 --- a/testUpdateHostsFile.py +++ b/testUpdateHostsFile.py @@ -64,7 +64,7 @@ class Base(unittest.TestCase): @property def sep(self): if platform.system().lower() == "windows": - return "/" + return "\\" return os.sep def assert_called_once(self, mock_method): @@ -1125,12 +1125,13 @@ class TestUpdateReadmeData(BaseMockDir): ) update_readme_data(self.readme_file, **kwargs) + if platform.system().lower() == "windows": + sep = "/" + else: + sep = self.sep + expected = { - "base": { - "location": "foo" + self.sep, - "sourcesdata": "hosts", - "entries": 5, - }, + "base": {"location": "foo" + sep, "sourcesdata": "hosts", "entries": 5}, "foo": "bar", } @@ -1147,8 +1148,13 @@ class TestUpdateReadmeData(BaseMockDir): ) update_readme_data(self.readme_file, **kwargs) + if platform.system().lower() == "windows": + sep = "/" + else: + sep = self.sep + expected = { - "base": {"location": "foo" + self.sep, "sourcesdata": "hosts", "entries": 5} + "base": {"location": "foo" + sep, "sourcesdata": "hosts", "entries": 5} } with open(self.readme_file, "r") as f: @@ -1167,12 +1173,13 @@ class TestUpdateReadmeData(BaseMockDir): ) update_readme_data(self.readme_file, **kwargs) + if platform.system().lower() == "windows": + sep = "/" + else: + sep = self.sep + expected = { - "com-org": { - "location": "foo" + self.sep, - "sourcesdata": "hosts", - "entries": 5, - } + "com-org": {"location": "foo" + sep, "sourcesdata": "hosts", "entries": 5} } with open(self.readme_file, "r") as f: