Skip to content

Commit 04bcf51

Browse files
committed
TestMessageAboutScriptsNotOnPATH: make working on windows again second try
1 parent c347c45 commit 04bcf51

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

tests/unit/test_wheel.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ def test_single_script__single_dir_not_on_PATH(self) -> None:
536536
retval = self._template(paths=["/a/b", "/c/d/bin"], scripts=["/c/d/foo"])
537537
assert retval is not None
538538
assert "--no-warn-script-location" in retval
539-
assert f"foo is installed in '{Path('/c/d')}'" in retval
539+
assert f"foo is installed in '{Path('/c/d').resolve()}'" in retval
540540
assert self.tilde_warning_msg not in retval
541541

542542
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:
545545
)
546546
assert retval is not None
547547
assert "--no-warn-script-location" in retval
548-
assert f"baz and foo are installed in '{Path('/c/d')}'" in retval
548+
assert f"baz and foo are installed in '{Path('/c/d').resolve()}'" in retval
549549
assert self.tilde_warning_msg not in retval
550550

551551
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:
555555
)
556556
assert retval is not None
557557
assert "--no-warn-script-location" in retval
558-
assert f"bar, baz and foo are installed in '{Path('/c/d')}'" in retval
559-
assert f"spam is installed in '{Path('/a/b/c')}'" in retval
558+
assert f"bar, baz and foo are installed in '{Path('/c/d').resolve()}'" in retval
559+
assert f"spam is installed in '{Path('/a/b/c').resolve()}'" in retval
560560
assert self.tilde_warning_msg not in retval
561561

562562
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:
566566
)
567567
assert retval is not None
568568
assert "--no-warn-script-location" in retval
569-
assert f"bar, baz and foo are installed in '{Path('/c/d')}'" in retval
570-
assert f"eggs and spam are installed in '{Path('/a/b/c')}'" in retval
569+
assert f"bar, baz and foo are installed in '{Path('/c/d').resolve()}'" in retval
570+
assert f"eggs and spam are installed in '{Path('/a/b/c').resolve()}'" in retval
571571
assert self.tilde_warning_msg not in retval
572572

573573
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:
644644
)
645645
assert retval is not None
646646
assert "--no-warn-script-location" in retval
647-
assert f"bar, baz and foo are installed in '{Path('/c/d')}'" in retval
648-
assert f"eggs and spam are installed in '{Path('/a/b/c')}'" in retval
649-
assert f"tilde is installed in '{Path('/e/f')}'" in retval
647+
assert f"bar, baz and foo are installed in '{Path('/c/d').resolve()}'" in retval
648+
assert f"eggs and spam are installed in '{Path('/a/b/c').resolve()}'" in retval
649+
assert f"tilde is installed in '{Path('/e/f').resolve()}'" in retval
650650
assert self.tilde_warning_msg in retval
651651

652652
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
662662
)
663663
assert retval is not None
664664
assert "--no-warn-script-location" in retval
665-
assert f"bar, baz and foo are installed in '{Path('/c/d')}'" in retval
666-
assert f"eggs and spam are installed in '{Path('/e/f~f/c')}'" in retval
665+
assert f"bar, baz and foo are installed in '{Path('/c/d').resolve()}'" in retval
666+
assert (
667+
f"eggs and spam are installed in '{Path('/e/f~f/c').resolve()}'" in retval
668+
)
667669
assert self.tilde_warning_msg not in retval
668670

669671

0 commit comments

Comments
 (0)