Merge branch 'topic/Fix-macos-test-failures' into 'master'

Fix macOS specific test failures

See merge request it/e3-aws!102

Author: rowan-walshe

src/e3/aws/troposphere/asset.py

@@ -70,7 +70,8 @@ def checksum(self) -> str:
             return ""
 
         fingerprint = sha256()
-        for f in Path(self.data_dir).iterdir():
+        # Sort files to ensure deterministic hash across different systems
+        for f in sorted(Path(self.data_dir).iterdir()):
             if f in self._cached_ignored:
                 continue
             fingerprint.update(f.relative_to(self.data_dir).as_posix().encode())

tests/tests_e3_aws/cfn/main/main_test.py

@@ -8,6 +8,7 @@
 
 from botocore.stub import ANY
 from e3.mock.os.process import mock_run, CommandResult
+from e3.os.process import which
 from e3.aws import AWSEnv, default_region
 from e3.aws.cfn import Stack
 from e3.aws.cfn.main import CFNMain
@@ -235,13 +236,14 @@ class MyCFNMain(CFNMain):
         def create_stack(self) -> Stack:
             return Stack(name="teststack")
 
+    git_path = which("git", default="/usr/bin/git")
     with mock_run(
         config={
             "results": [
                 # Make CFNMain think we are on main
                 CommandResult(
                     cmd=[
-                        "/usr/bin/git",
+                        git_path,
                         "-c",
                         "fetch.prune=false",
                         "branch",
@@ -252,7 +254,7 @@ def create_stack(self) -> Stack:
                 # Make CFNMain detect some local changes
                 CommandResult(
                     cmd=[
-                        "/usr/bin/git",
+                        git_path,
                         "-c",
                         "fetch.prune=false",
                         "status",
@@ -279,13 +281,14 @@ class MyCFNMain(CFNMain):
         def create_stack(self) -> Stack:
             return Stack(name="teststack")
 
+    git_path = which("git", default="/usr/bin/git")
     with mock_run(
         config={
             "results": [
                 # Make CFNMain detect an incorrect branch
                 CommandResult(
                     cmd=[
-                        "/usr/bin/git",
+                        git_path,
                         "-c",
                         "fetch.prune=false",
                         "branch",
@@ -364,13 +367,14 @@ def create_stack(self) -> Stack:
     )
     stubber.add_response("describe_stacks", {}, {"StackName": "teststack"})
 
+    git_path = which("git", default="/usr/bin/git")
     with default_region("us-east-1"), stubber, mock_run(
         config={
             "results": [
                 # Make CFNMain think we are on main
                 CommandResult(
                     cmd=[
-                        "/usr/bin/git",
+                        git_path,
                         "-c",
                         "fetch.prune=false",
                         "branch",
@@ -381,7 +385,7 @@ def create_stack(self) -> Stack:
                 # Make CFNMain detect no local changes
                 CommandResult(
                     cmd=[
-                        "/usr/bin/git",
+                        git_path,
                         "-c",
                         "fetch.prune=false",
                         "status",
@@ -391,7 +395,7 @@ def create_stack(self) -> Stack:
                 # Make CFNMain detect an outdated branch
                 CommandResult(
                     cmd=[
-                        "/usr/bin/git",
+                        git_path,
                         "-c",
                         "fetch.prune=false",
                         "fetch",