This is an automated email from the ASF dual-hosted git repository.
dubeejw pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-python.git
The following commit(s) were added to refs/heads/master by this push:
new aaeb2ff move global variables initialized to init (#54)
aaeb2ff is described below
commit aaeb2ff494e8785abd7a5fc0ba3d902752c47732
Author: Silva Song <[email protected]>
AuthorDate: Wed Mar 27 23:13:34 2019 +0800
move global variables initialized to init (#54)
* move global variables initialized to init
* modify two test cases to initialize the return status
* modifiy python3Action Dockerfile and Tests
---
core/python3AiAction/Dockerfile | 2 +-
core/{pythonAction => python3AiAction}/pythonrunner.py | 2 +-
core/pythonAction/pythonrunner.py | 2 +-
.../runtime/actionContainers/PythonActionContainerTests.scala | 10 ++--------
4 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/core/python3AiAction/Dockerfile b/core/python3AiAction/Dockerfile
index b815b9e..be7e7f7 100644
--- a/core/python3AiAction/Dockerfile
+++ b/core/python3AiAction/Dockerfile
@@ -56,6 +56,6 @@ RUN mkdir -p /actionProxy
ADD
https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-docker/dockerskeleton%401.3.3/core/actionProxy/actionproxy.py
/actionProxy/actionproxy.py
RUN mkdir -p /pythonAction
-ADD
https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-python/3%401.0.3/core/pythonAction/pythonrunner.py
/pythonAction/pythonrunner.py
+COPY pythonrunner.py /pythonAction/pythonrunner.py
CMD ["/bin/bash", "-c", "cd /pythonAction && python -u pythonrunner.py"]
diff --git a/core/pythonAction/pythonrunner.py
b/core/python3AiAction/pythonrunner.py
similarity index 100%
copy from core/pythonAction/pythonrunner.py
copy to core/python3AiAction/pythonrunner.py
index b6cc3d7..70df3fc 100644
--- a/core/pythonAction/pythonrunner.py
+++ b/core/python3AiAction/pythonrunner.py
@@ -71,6 +71,7 @@ class PythonRunner(ActionRunner):
else:
sys.stderr.write('Invalid virtualenv. Zip file does not
include /virtualenv/bin/' + os.path.basename(activate_this_file) + '\n')
return False
+ exec(self.fn, self.global_context)
return True
except Exception:
traceback.print_exc(file=sys.stderr, limit=0)
@@ -84,7 +85,6 @@ class PythonRunner(ActionRunner):
try:
os.environ = env
self.global_context['param'] = args
- exec(self.fn, self.global_context)
exec('fun = %s(param)' % self.mainFn, self.global_context)
result = self.global_context['fun']
except Exception:
diff --git a/core/pythonAction/pythonrunner.py
b/core/pythonAction/pythonrunner.py
index b6cc3d7..70df3fc 100644
--- a/core/pythonAction/pythonrunner.py
+++ b/core/pythonAction/pythonrunner.py
@@ -71,6 +71,7 @@ class PythonRunner(ActionRunner):
else:
sys.stderr.write('Invalid virtualenv. Zip file does not
include /virtualenv/bin/' + os.path.basename(activate_this_file) + '\n')
return False
+ exec(self.fn, self.global_context)
return True
except Exception:
traceback.print_exc(file=sys.stderr, limit=0)
@@ -84,7 +85,6 @@ class PythonRunner(ActionRunner):
try:
os.environ = env
self.global_context['param'] = args
- exec(self.fn, self.global_context)
exec('fun = %s(param)' % self.mainFn, self.global_context)
result = self.global_context['fun']
except Exception:
diff --git
a/tests/src/test/scala/runtime/actionContainers/PythonActionContainerTests.scala
b/tests/src/test/scala/runtime/actionContainers/PythonActionContainerTests.scala
index f36b8d9..132811b 100644
---
a/tests/src/test/scala/runtime/actionContainers/PythonActionContainerTests.scala
+++
b/tests/src/test/scala/runtime/actionContainers/PythonActionContainerTests.scala
@@ -267,10 +267,7 @@ class PythonActionContainerTests extends
BasicActionRunnerTests with WskActorSys
val (out, err) = withActionContainer() { c =>
val (initCode, initRes) = c.init(initPayload(code, main = "main"))
if (initErrorsAreLogged) {
- initCode should be(200)
- val args = JsObject("msg" -> JsString("any"))
- val (runCode, runRes) = c.run(runPayload(args))
- runCode should be(502)
+ initCode should be(502)
} else {
// it actually means it is actionloop
// it checks the error at init time
@@ -420,10 +417,7 @@ class PythonActionContainerTests extends
BasicActionRunnerTests with WskActorSys
if (initErrorsAreLogged) {
val (initCode, res) = c.init(initPayload(code))
- initCode should be(200)
-
- val (runCode, runRes) = c.run(runPayload(JsObject()))
- runCode should be(502)
+ initCode should be(502)
} else {
// action loop detects those errors at init time
val (initCode, initRes) = c.init(initPayload(code))
