From: funilrys Date: Mon, 13 Jul 2020 13:34:28 +0000 (+0200) Subject: Change strategy regarding #1332. X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=abf763e9a0a9c93749f8b52aa2543a85feda9462;p=stevenblack-hosts.git Change strategy regarding #1332. Instead of changing the directory separator globally, we change it only when we generate/update the readme data file. --- 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: