use whoami in the tests

salt/platform/win.py

@@ -187,7 +187,7 @@ class HANDLE(wintypes.HANDLE):
         if self and not getattr(self, "closed", False):
             try:
                 CloseHandle(self.Detach())
-            except Exception:
+            except OSError:
                 # Suppress the error when there is no handle (WinError 6)
                 if ctypes.get_last_error() == 6:
                     pass

tests/pytests/functional/utils/test_win_runas.py

@@ -18,21 +18,22 @@ def user():
         yield account
 
 
-def test_runas(user):
-    cmd = "hostname && echo foo"
+def test_compound_runas(user):
+    cmd = "hostname && whoami"
     result = win_runas.runas(
         cmdLine=cmd,
         username=user.username,
         password=user.password,
     )
-    assert "foo" in result["stdout"]
+    assert user.username in result["stdout"]
 
 
-def test_runas_unpriv(user):
-    cmd = "hostname && echo foo"
+def test_compound_runas_unpriv(user):
+    cmd = "hostname && whoami"
+    print(user.username)
     result = win_runas.runas_unpriv(
         cmd=cmd,
         username=user.username,
         password=user.password,
     )
-    assert "foo" in result["stdout"]
+    assert user.username in result["stdout"]