wip: testing things

JohnVillalovos · JohnVillalovos · commit 39650ae64319 · 2023-12-28T14:29:18.000-08:00
diff --git a/gitlab/cli.py b/gitlab/cli.py
@@ -1,6 +1,7 @@
 import argparse
 import functools
 import os
+import pathlib
 import re
 import sys
 import textwrap
@@ -299,11 +300,15 @@ def _parse_value(v: Any) -> Any:
     if isinstance(v, str) and v.startswith("@"):
         # If the user-provided value starts with @, we try to read the file
         # path provided after @ as the real value. Exit on any error.
+        filepath = pathlib.Path(v[1:]).expanduser().resolve()
         try:
-            with open(v[1:], encoding="utf-8") as f:
+            with open(filepath, encoding="utf-8") as f:
                 return f.read()
-        except Exception as e:
-            sys.stderr.write(f"{e}\n")
+        except UnicodeDecodeError:
+            with open(filepath, "rb") as f:
+                return f.read()
+        except (FileNotFoundError, PermissionError) as exc:
+            sys.stderr.write(f"{exc}\n")
             sys.exit(1)
 
     return v
diff --git a/tests/functional/cli/test_cli_v4.py b/tests/functional/cli/test_cli_v4.py
@@ -540,12 +540,15 @@ def test_update_application_settings(gitlab_cli):
     assert ret.success
 
 
-def test_create_project_with_values_from_file(gitlab_cli, tmpdir):
+def test_create_project_with_values_from_file(gitlab_cli, fixture_dir, tmpdir):
     name = "gitlab-project-from-file"
     description = "Multiline\n\nData\n"
     from_file = tmpdir.join(name)
     from_file.write(description)
     from_file_path = f"@{str(from_file)}"
+    avatar_file = fixture_dir / "avatar.png"
+    assert avatar_file.exists()
+    avatar_file_path = f"@{avatar_file}"
 
     cmd = [
         "-v",
@@ -555,6 +558,8 @@ def test_create_project_with_values_from_file(gitlab_cli, tmpdir):
         name,
         "--description",
         from_file_path,
+        "--avatar",
+        avatar_file_path,
     ]
     ret = gitlab_cli(cmd)
 
diff --git a/tests/unit/test_cli.py b/tests/unit/test_cli.py
@@ -90,12 +90,14 @@ def test_parse_value():
     os.unlink(temp_path)
 
     fl = io.StringIO()
+
     with redirect_stderr(fl):
         with pytest.raises(SystemExit) as exc:
             cli._parse_value("@/thisfileprobablydoesntexist")
+        non_existent_file = os.path.abspath("/thisfileprobablydoesntexist")
         assert (
-            fl.getvalue() == "[Errno 2] No such file or directory:"
-            " '/thisfileprobablydoesntexist'\n"
+            fl.getvalue() == f"[Errno 2] No such file or directory:"
+            f" '{non_existent_file}'\n"
         )
         assert exc.value.code == 1
 
