Skip to content

Commit 3658e58

Browse files
committed
fix: does this work on windows?
1 parent ce254bc commit 3658e58

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

aws_lambda_builders/workflows/provided_make/actions.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
Action to build a specific Makefile target
33
"""
44

5-
import os
65
import logging
76

87
from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError
@@ -58,8 +57,8 @@ def execute(self):
5857
self.osutils.makedirs(self.artifacts_dir)
5958

6059
try:
61-
current_env = os.environ.copy()
62-
current_env.update({"ARTIFACTS_DIR": self.artifacts_dir})
60+
current_env = self.osutils.environ().copy()
61+
current_env.update({"ARTIFACTS_DIR": self.osutils.abspath(self.artifacts_dir)})
6362
self.subprocess_make.run(
6463
["build-{logical_id}".format(logical_id=self.build_logical_id)], env=current_env, cwd=self.scratch_dir,
6564
)

aws_lambda_builders/workflows/provided_make/utils.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ def popen(self, command, stdout=None, stderr=None, env=None, cwd=None):
2424
p = subprocess.Popen(command, stdout=stdout, stderr=stderr, env=env, cwd=cwd)
2525
return p
2626

27+
def environ(self):
28+
return os.environ
29+
30+
def abspath(self, path):
31+
return os.path.abspath(path)
32+
2733
@property
2834
def pipe(self):
2935
return subprocess.PIPE

tests/unit/workflows/provided_make/test_actions.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import os
22

33
from unittest import TestCase
4+
from unittest.mock import ANY
5+
46
from mock import patch
57

68
from aws_lambda_builders.actions import ActionFailedError
@@ -37,9 +39,7 @@ def test_call_makefile_target(self, OSUtilMock, SubprocessMakeMock):
3739

3840
action.execute()
3941

40-
subprocess_make.run.assert_called_with(
41-
["build-logical_id"], env={"ARTIFACTS_DIR": "artifacts"}, cwd="scratch_dir"
42-
)
42+
subprocess_make.run.assert_called_with(["build-logical_id"], env=ANY, cwd="scratch_dir")
4343

4444
@patch("aws_lambda_builders.workflows.provided_make.utils.OSUtils")
4545
@patch("aws_lambda_builders.workflows.provided_make.make.SubProcessMake")
@@ -65,6 +65,4 @@ def test_makefile_target_fails(self, OSUtilMock, SubprocessMakeMock):
6565
with self.assertRaises(ActionFailedError):
6666
action.execute()
6767

68-
subprocess_make.run.assert_called_with(
69-
["build-logical_id"], env={"ARTIFACTS_DIR": "artifacts"}, cwd="scratch_dir"
70-
)
68+
subprocess_make.run.assert_called_with(["build-logical_id"], env=ANY, cwd="scratch_dir")

0 commit comments

Comments
 (0)