From 804b71f93f7067d3b02212ee96edf9185c81ad0a Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Tue, 26 Mar 2024 12:51:41 -0700
Subject: [PATCH] umu_test: update tests

- Replace references to UnixUser class
---
 umu/umu_test.py | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/umu/umu_test.py b/umu/umu_test.py
index 6f580267..34eb0385 100644
--- a/umu/umu_test.py
+++ b/umu/umu_test.py
@@ -13,6 +13,7 @@
 from unittest.mock import patch
 from pathlib import Path
 from shutil import rmtree, copytree, copy
+from pwd import getpwuid
 
 
 class TestGameLauncher(unittest.TestCase):
@@ -42,6 +43,7 @@ def setUp(self):
             "STORE": "",
             "PROTON_VERB": "",
         }
+        self.user = getpwuid(os.getuid()).pw_name
         self.test_opts = "-foo -bar"
         # Proton verb
         # Used when testing build_command
@@ -1679,7 +1681,6 @@ def test_setup_pfx_symlinks_else(self):
         """
         result = None
         pattern = r"^/home/[\w\d]+"
-        user = umu_util.UnixUser()
         unexpanded_path = re.sub(
             pattern,
             "~",
@@ -1695,7 +1696,7 @@ def test_setup_pfx_symlinks_else(self):
 
         # Create the symlink to the test file itself
         Path(unexpanded_path).joinpath("drive_c/users").joinpath(
-            user.get_user()
+            self.user
         ).expanduser().symlink_to(Path(self.test_file).absolute())
         Path(unexpanded_path).joinpath("drive_c/users").joinpath(
             "steamuser"
@@ -1716,7 +1717,6 @@ def test_setup_pfx_symlinks_unixuser(self):
         """
         result = None
         pattern = r"^/home/[\w\d]+"
-        user = umu_util.UnixUser()
         unexpanded_path = re.sub(
             pattern,
             "~",
@@ -1727,7 +1727,7 @@ def test_setup_pfx_symlinks_unixuser(self):
 
         # Create only the user dir
         Path(unexpanded_path).joinpath("drive_c/users").joinpath(
-            user.get_user()
+            self.user
         ).expanduser().mkdir(parents=True, exist_ok=True)
 
         result = umu_run.setup_pfx(unexpanded_path)
@@ -1745,7 +1745,7 @@ def test_setup_pfx_symlinks_unixuser(self):
         )
         self.assertEqual(
             Path(self.test_file).joinpath("drive_c/users/steamuser").readlink(),
-            Path(user.get_user()),
+            Path(self.user),
             "Expected steamuser -> user",
         )
 
@@ -1755,7 +1755,6 @@ def test_setup_pfx_symlinks_steamuser(self):
         Tests the case when only steamuser exist and the user dir does not exist
         """
         result = None
-        user = umu_util.UnixUser()
         pattern = r"^/home/[\w\d]+"
         unexpanded_path = re.sub(
             pattern,
@@ -1784,15 +1783,13 @@ def test_setup_pfx_symlinks_steamuser(self):
             "Expected steamuser to be created",
         )
         self.assertTrue(
-            Path(unexpanded_path + "/drive_c/users/" + user.get_user())
+            Path(unexpanded_path + "/drive_c/users/" + self.user)
             .expanduser()
             .is_symlink(),
             "Expected symbolic link for unixuser",
         )
         self.assertEqual(
-            Path(self.test_file)
-            .joinpath(f"drive_c/users/{user.get_user()}")
-            .readlink(),
+            Path(self.test_file).joinpath(f"drive_c/users/{self.user}").readlink(),
             Path("steamuser"),
             "Expected unixuser -> steamuser",
         )
@@ -1876,7 +1873,6 @@ def test_setup_pfx_paths(self):
     def test_setup_pfx(self):
         """Test setup_pfx."""
         result = None
-        user = umu_util.UnixUser()
         result = umu_run.setup_pfx(self.test_file)
         self.assertIsNone(
             result,
@@ -1896,7 +1892,7 @@ def test_setup_pfx(self):
             "Expected steamuser to be created",
         )
         self.assertTrue(
-            Path(self.test_file + "/drive_c/users/" + user.get_user())
+            Path(self.test_file + "/drive_c/users/" + self.user)
             .expanduser()
             .is_symlink(),
             "Expected symlink of username -> steamuser",