tcsenpai/UWINE
1
0
Fork 0
mirror of https://github.com/tcsenpai/UWINE.git synced 2025-06-06 11:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

ulwgl_test: refactor filepaths in tests

Browse Source 
- Try to prefer using .joinpath when joining segments
This commit is contained in:
R1kaB3rN 2024-02-21 18:50:42 -08:00
parent a78ea7a12b
commit 3d5119c66e
No known key found for this signature in database
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ulwgl_test.py
View File

@ -907,12 +907,8 @@ class TestGameLauncher(unittest.TestCase):
# Replaces the expanded path to unexpanded # Replaces the expanded path to unexpanded
# Example: ~/some/path/to/this/file -> /home/foo/path/to/this/file # Example: ~/some/path/to/this/file -> /home/foo/path/to/this/file
path_to_tmp = Path( path_to_tmp = Path(__file__).cwd().joinpath(self.test_file).as_posix()
Path(__file__).cwd().as_posix() + "/" + self.test_file path_to_exe = Path(__file__).cwd().joinpath(self.test_exe).as_posix()
).as_posix()
path_to_exe = Path(
Path(__file__).cwd().as_posix() + "/" + self.test_exe
).as_posix()
# Replace /home/[a-zA-Z]+ substring in path with tilda # Replace /home/[a-zA-Z]+ substring in path with tilda
unexpanded_path = re.sub( unexpanded_path = re.sub(
@ -1281,9 +1277,7 @@ class TestGameLauncher(unittest.TestCase):
unexpanded_path = re.sub( unexpanded_path = re.sub(
pattern, pattern,
"~", "~",
Path( Path(self.test_file).cwd().joinpath(self.test_file).as_posix(),
Path(self.test_file).cwd().as_posix() + "/" + self.test_file
).as_posix(),
) )
result = ulwgl_run.setup_pfx(unexpanded_path) result = ulwgl_run.setup_pfx(unexpanded_path)
@ -1317,12 +1311,12 @@ class TestGameLauncher(unittest.TestCase):
new_unexpanded_path = re.sub( new_unexpanded_path = re.sub(
pattern, pattern,
"~", "~",
Path(new_dir.cwd().as_posix() + "/" + "foo").as_posix(), new_dir.cwd().joinpath("foo").as_posix(),
) )
ulwgl_run.setup_pfx(new_unexpanded_path) ulwgl_run.setup_pfx(new_unexpanded_path)
new_link = Path("foo" + "/pfx").resolve() new_link = Path("foo/pfx").resolve()
self.assertTrue( self.assertTrue(
old_link is not new_link, old_link is not new_link,
"Expected the symbolic link to change after moving the WINEPREFIX", "Expected the symbolic link to change after moving the WINEPREFIX",
@ -1347,9 +1341,7 @@ class TestGameLauncher(unittest.TestCase):
unexpanded_path = re.sub( unexpanded_path = re.sub(
pattern, pattern,
"~", "~",
Path( Path(self.test_file).cwd().joinpath(self.test_file).as_posix(),
Path(self.test_file).cwd().as_posix() + "/" + self.test_file
).as_posix(),
) )
result = ulwgl_run.setup_pfx(unexpanded_path) result = ulwgl_run.setup_pfx(unexpanded_path)
@ -1386,7 +1378,7 @@ class TestGameLauncher(unittest.TestCase):
unexpanded_path = re.sub( unexpanded_path = re.sub(
pattern, pattern,
"~", "~",
Path(Path(self.test_file).as_posix()).as_posix(), Path(self.test_file).as_posix(),
) )
result = ulwgl_run.setup_pfx(unexpanded_path) result = ulwgl_run.setup_pfx(unexpanded_path)
@ -1493,9 +1485,7 @@ class TestGameLauncher(unittest.TestCase):
def test_env_vars_paths(self): def test_env_vars_paths(self):
"""Test check_env when setting unexpanded paths for $WINEPREFIX and $PROTONPATH.""" """Test check_env when setting unexpanded paths for $WINEPREFIX and $PROTONPATH."""
pattern = r"^/home/[\w\d]+" # Expects only unicode decimals and alphanumerics pattern = r"^/home/[\w\d]+" # Expects only unicode decimals and alphanumerics
path_to_tmp = Path( path_to_tmp = Path(__file__).cwd().joinpath(self.test_file).as_posix()
Path(__file__).cwd().as_posix() + "/" + self.test_file
).as_posix()
# Replace /home/[a-zA-Z]+ substring in path with tilda # Replace /home/[a-zA-Z]+ substring in path with tilda
unexpanded_path = re.sub( unexpanded_path = re.sub(