fix virtualenv tests (ibm-functions#15)

csantanapr · web-flow · commit 11c06eb85467 · 2018-01-10T18:42:30.000-05:00
* fix virtualenv tests
diff --git a/python3/Dockerfile b/python3/Dockerfile
@@ -9,7 +9,9 @@ RUN apt-get update && apt-get install -y \
         libxml2-dev \
         libffi-dev \
         libssl-dev \
+        zip \
         unzip \
+        vim \
         && rm -rf /var/lib/apt/lists/*
 
 RUN apt-cache search linux-headers-generic
diff --git a/python3/requirements.txt b/python3/requirements.txt
@@ -17,7 +17,7 @@ virtualenv == 15.1.0
 twisted == 17.1.0
 
 # IBM specific python modules
-ibm_db == 2.0.7
+ibm_db == 2.0.8a
 cloudant == 2.7.0
 watson-developer-cloud == 1.0.2
 ibm-cos-sdk == 2.0.0
diff --git a/tests/dat/actions/p3zip/__main__.py b/tests/dat/actions/p3zip/__main__.py
@@ -12,3 +12,7 @@ def main(args):
 def naim(args):
     return main(args)
 
+if __name__ == "__main__":
+    # execute only if run as a script
+    print(main({}))
+
diff --git a/tests/dat/actions/p3zip/build.sh b/tests/dat/actions/p3zip/build.sh
@@ -1,7 +1,16 @@
 #!/bin/bash
 
-rm ../python3_jessie_virtualenv.zip
+#helper file to create and test python zip action
+
+ZIP_NAME="python3_jessie_virtualenv.zip"
+IMAGE_NAME="ibmfunctions/action-python-v3:latest"
+ACTION_NAME="zip_jessie"
+
+rm ${ZIP_NAME}
 rm -r virtualenv
-docker run --rm -v "$PWD:/tmp" action-python-v3 sh -c "cd tmp; virtualenv virtualenv; source virtualenv/bin/activate; pip install -r requirements.txt;"
-zip -r ../python3_jessie_virtualenv.zip virtualenv __main__.py
+set -ex
 
+docker run --rm -v "$PWD:/tmp" ${IMAGE_NAME}  bash -c "cd /tmp && virtualenv virtualenv && source virtualenv/bin/activate && pip install -r requirements.txt"
+zip -r ${ZIP_NAME} virtualenv __main__.py
+bx wsk action update ${ACTION_NAME} ${ZIP_NAME} --docker ${IMAGE_NAME}
+bx wsk action invoke ${ACTION_NAME} -b
diff --git a/tests/dat/actions/p3zip/python3_jessie_virtualenv.zip b/tests/dat/actions/p3zip/python3_jessie_virtualenv.zip
diff --git a/tests/src/test/scala/system/basic/WskBasicIBMPythonTests.scala b/tests/src/test/scala/system/basic/WskBasicIBMPythonTests.scala
@@ -19,10 +19,10 @@ package system.basic
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.Matchers
-//import scala.concurrent.duration.DurationInt
+import scala.concurrent.duration.DurationInt
 import spray.json._
 import spray.json.DefaultJsonProtocol.StringJsonFormat
-//import java.io.File
+import java.io.File
 import common.JsHelpers
 import common.TestHelpers
 import common.TestUtils
@@ -113,27 +113,23 @@ class WskBasicIBMPythonTests extends TestHelpers with WskTestHelpers with Matche
     }
   }
 
-  /*
-  FIXME: virtualenv not working currently
   behavior of "Python virtualenv"
 
-  it should s"invoke a zipped $kind action with virtualenv package" in withAssetCleaner(wskprops) {
-    (wp, assetHelper) =>
-      val userdir = System.getProperty("user.dir") + "/dat/actions/"
-      val filename = "python3_jessie_virtualenv.zip"
-      val name = filename
-      val zippedPythonAction = Some(new File(userdir, filename).toString())
+  it should s"invoke a zipped $kind action with virtualenv package" in withAssetCleaner(wskprops) { (wp, assetHelper) =>
+    val userdir = System.getProperty("user.dir") + "/dat/actions/p3zip"
+    val filename = "python3_jessie_virtualenv.zip"
+    val name = filename
+    val zippedPythonAction = Some(new File(userdir, filename).toString())
 
-      assetHelper.withCleaner(wsk.action, name) { (action, _) =>
-        action.create(name, zippedPythonAction, kind = Some(kind))
-      }
+    assetHelper.withCleaner(wsk.action, name) { (action, _) =>
+      action.create(name, zippedPythonAction, kind = Some(kind))
+    }
 
-      withActivation(wsk.activation, wsk.action.invoke(name), totalWait = 120.seconds) { activation =>
-        val response = activation.response
-        response.result.get.fields.get("error") shouldBe empty
-        response.result.get.fields.get("Networkinfo: ") shouldBe defined
-      }
+    withActivation(wsk.activation, wsk.action.invoke(name), totalWait = 120.seconds) { activation =>
+      val response = activation.response
+      response.result.get.fields.get("error") shouldBe empty
+      response.result.get.fields.get("Networkinfo: ") shouldBe defined
+    }
   }
- */
 
 }
