Skip to content

helping python to find itself... #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
csantanapr merged 3 commits into from
Feb 19, 2019
Merged

helping python to find itself... #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d48a8f
helping python to find itself...
sciabarracom Feb 18, 2019
28e22b9
adding a test to ensure sys.executable is valid
sciabarracom Feb 18, 2019
dc51fd9
fixed format
sciabarracom Feb 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/pythonActionLoop/pythonbuild.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def build(source_dir, target_file, launcher):
if os.path.isfile(main):
cmd += """
cd %s
exec python %s "$@"
exec "$(which python)" %s "$@"
Copy link
Member

@csantanapr csantanapr Feb 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a test with an action to check that sys.executable is not empty?

""" % (source_dir, launcher)
else:
cmd += """
Expand Down
18 changes: 18 additions & 0 deletions tests/src/test/scala/runtime/actionContainers/PythonActionContainerTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,4 +438,22 @@ class PythonActionContainerTests extends BasicActionRunnerTests with WskActorSys
e should include("Traceback")
})
}

it should "have a valid sys.executable" in {
withActionContainer() { c =>
val code =
"""
|import sys
|def main(args):
| return { "sys": sys.executable }
""".stripMargin

val (initCode, res) = c.init(initPayload(code))
initCode should be(200)

val (runCode, runRes) = c.run(runPayload(JsObject()))
runCode should be(200)
runRes.get.fields.get("sys").get.toString() should include("python")
}
}
}