Add tests of multi-pass requirements install and support package hand…

…ling.
beeware · Oct 5, 2023 · d270c24 · d270c24
1 parent 3873598
commit d270c24
Show file tree

Hide file tree

Showing 6 changed files with 454 additions and 34 deletions.
diff --git a/src/briefcase/platforms/macOS/__init__.py b/src/briefcase/platforms/macOS/__init__.py
@@ -84,6 +84,8 @@ def _install_app_requirements(
                         [
                             sys.executable,
                             "-u",
+                            "-X",
+                            "utf8",
                             "-m",
                             "pip",
                             "install",
@@ -100,6 +102,7 @@ def _install_app_requirements(
                             for package, version in binary_packages
                         ],
                         check=True,
+                        encoding="UTF-8",
                         env={
                             "PYTHONPATH": str(
                                 self.support_path(app)

diff --git a/tests/platforms/macOS/app/conftest.py b/tests/platforms/macOS/app/conftest.py
@@ -7,7 +7,7 @@
 
 
 @pytest.fixture
-def first_app_with_binaries(first_app_config, tmp_path):
+def first_app_templated(first_app_config, tmp_path):
     app_path = (
         tmp_path
         / "base_path"
@@ -59,8 +59,30 @@ def first_app_with_binaries(first_app_config, tmp_path):
         },
     )
 
+    # Create some folders that need to exist.
+    (app_path / "Contents" / "Resources" / "app_packages").mkdir(parents=True)
+    (app_path / "Contents" / "Frameworks").mkdir(parents=True)
+
+    # Select dmg packaging by default
+    first_app_config.packaging_format = "dmg"
+
+    return first_app_config
+
+
+@pytest.fixture
+def first_app_with_binaries(first_app_templated, first_app_config, tmp_path):
+    app_path = (
+        tmp_path
+        / "base_path"
+        / "build"
+        / "first-app"
+        / "macos"
+        / "app"
+        / "First App.app"
+    )
+
     # Create some libraries that need to be signed.
-    lib_path = app_path / "Contents" / "Resources"
+    lib_path = app_path / "Contents" / "Resources" / "app_packages"
     frameworks_path = app_path / "Contents" / "Frameworks"
 
     for lib in [
@@ -103,7 +125,4 @@ def first_app_with_binaries(first_app_config, tmp_path):
     with (lib_path / "unknown.binary").open("wb") as f:
         f.write(b"\xCA\xFE\xBA\xBEother")
 
-    # Select dmg packaging by default
-    first_app_config.packaging_format = "dmg"
-
     return first_app_config