From 04bcf517595fed877e1ecf795a54a818b5011629 Mon Sep 17 00:00:00 2001 From: Maximillian Bensch Date: Wed, 11 Jan 2023 11:46:19 +0100 Subject: [PATCH] TestMessageAboutScriptsNotOnPATH: make working on windows again second try --- tests/unit/test_wheel.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/unit/test_wheel.py b/tests/unit/test_wheel.py index 61770356c63..30e15a332af 100644 --- a/tests/unit/test_wheel.py +++ b/tests/unit/test_wheel.py @@ -536,7 +536,7 @@ def test_single_script__single_dir_not_on_PATH(self) -> None: retval = self._template(paths=["/a/b", "/c/d/bin"], scripts=["/c/d/foo"]) assert retval is not None assert "--no-warn-script-location" in retval - assert f"foo is installed in '{Path('/c/d')}'" in retval + assert f"foo is installed in '{Path('/c/d').resolve()}'" in retval assert self.tilde_warning_msg not in retval def test_two_script__single_dir_not_on_PATH(self) -> None: @@ -545,7 +545,7 @@ def test_two_script__single_dir_not_on_PATH(self) -> None: ) assert retval is not None assert "--no-warn-script-location" in retval - assert f"baz and foo are installed in '{Path('/c/d')}'" in retval + assert f"baz and foo are installed in '{Path('/c/d').resolve()}'" in retval assert self.tilde_warning_msg not in retval def test_multi_script__multi_dir_not_on_PATH(self) -> None: @@ -555,8 +555,8 @@ def test_multi_script__multi_dir_not_on_PATH(self) -> None: ) assert retval is not None assert "--no-warn-script-location" in retval - assert f"bar, baz and foo are installed in '{Path('/c/d')}'" in retval - assert f"spam is installed in '{Path('/a/b/c')}'" in retval + assert f"bar, baz and foo are installed in '{Path('/c/d').resolve()}'" in retval + assert f"spam is installed in '{Path('/a/b/c').resolve()}'" in retval assert self.tilde_warning_msg not in retval def test_multi_script_all__multi_dir_not_on_PATH(self) -> None: @@ -566,8 +566,8 @@ def test_multi_script_all__multi_dir_not_on_PATH(self) -> None: ) assert retval is not None assert "--no-warn-script-location" in retval - assert f"bar, baz and foo are installed in '{Path('/c/d')}'" in retval - assert f"eggs and spam are installed in '{Path('/a/b/c')}'" in retval + assert f"bar, baz and foo are installed in '{Path('/c/d').resolve()}'" in retval + assert f"eggs and spam are installed in '{Path('/a/b/c').resolve()}'" in retval assert self.tilde_warning_msg not in retval def test_two_script__single_dir_on_PATH(self) -> None: @@ -644,9 +644,9 @@ def test_multi_script_all_tilde__multi_dir_not_on_PATH(self) -> None: ) assert retval is not None assert "--no-warn-script-location" in retval - assert f"bar, baz and foo are installed in '{Path('/c/d')}'" in retval - assert f"eggs and spam are installed in '{Path('/a/b/c')}'" in retval - assert f"tilde is installed in '{Path('/e/f')}'" in retval + assert f"bar, baz and foo are installed in '{Path('/c/d').resolve()}'" in retval + assert f"eggs and spam are installed in '{Path('/a/b/c').resolve()}'" in retval + assert f"tilde is installed in '{Path('/e/f').resolve()}'" in retval assert self.tilde_warning_msg in retval def test_multi_script_all_tilde_not_at_start__multi_dir_not_on_PATH(self) -> None: @@ -662,8 +662,10 @@ def test_multi_script_all_tilde_not_at_start__multi_dir_not_on_PATH(self) -> Non ) assert retval is not None assert "--no-warn-script-location" in retval - assert f"bar, baz and foo are installed in '{Path('/c/d')}'" in retval - assert f"eggs and spam are installed in '{Path('/e/f~f/c')}'" in retval + assert f"bar, baz and foo are installed in '{Path('/c/d').resolve()}'" in retval + assert ( + f"eggs and spam are installed in '{Path('/e/f~f/c').resolve()}'" in retval + ) assert self.tilde_warning_msg not in retval