openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgr...@apache.org
Subject [openwhisk-cli] branch master updated: build binary test artifacts (#477)
Date Tue, 07 Jan 2020 19:40:35 GMT
This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git


The following commit(s) were added to refs/heads/master by this push:
     new d8a6735  build binary test artifacts (#477)
d8a6735 is described below

commit d8a673595efed862a48573c34a24489863b54835
Author: David Grove <dgrove-oss@users.noreply.github.com>
AuthorDate: Tue Jan 7 14:40:23 2020 -0500

    build binary test artifacts (#477)
    
    * build core repor's binary test artifacts before running tests.
    
    * fix test case that depended on the current decade (nice catch by @mdeuser)
    
    * ignore test that requires a specific Java jar.
      It was broken by removal of binary artifacts from core repository.
      Since the jar was not actually used anywhere else, it is not built
      by core's test:buildArtifacts.
---
 .travis.yml                                            |  2 +-
 .../core/cli/test/WskCliBasicUsageTests.scala          | 18 +++++++++---------
 .../openwhisk/core/cli/test/WskConfigTests.scala       |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 19b3f1e..17c592c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,7 @@ before_script:
 
 script:
   - cd $TRAVIS_BUILD_DIR/../openwhisk
-  - ./gradlew install
+  - ./gradlew install tests:buildArtifacts
   - cd $TRAVIS_BUILD_DIR
   - export BUILD_VERSION="latest"
   - if [ ! -z "$TRAVIS_TAG" ] ; then
diff --git a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala
b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala
index 5322286..f907109 100644
--- a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala
+++ b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala
@@ -459,18 +459,18 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers
{
       createResult.stderr should include regex "requires specifying the action kind"
   }
 
-  it should "Ensure that Java actions cannot be created without a specified main method"
in withAssetCleaner(wskprops) {
-    (wp, assetHelper) =>
-      val name = "helloJavaWithNoMainSpecified"
-      val file = Some(TestUtils.getTestActionFilename("helloJava.jar"))
+  ignore should "Ensure that Java actions cannot be created without a specified main method"
in withAssetCleaner(
+    wskprops) { (wp, assetHelper) =>
+    val name = "helloJavaWithNoMainSpecified"
+    val file = Some(TestUtils.getTestActionFilename("helloJava.jar"))
 
-      val createResult = assetHelper.withCleaner(wsk.action, name, confirmDelete = false)
{ (action, _) =>
-        action.create(name, file, expectedExitCode = ANY_ERROR_EXIT)
-      }
+    val createResult = assetHelper.withCleaner(wsk.action, name, confirmDelete = false) {
(action, _) =>
+      action.create(name, file, expectedExitCode = ANY_ERROR_EXIT)
+    }
 
-      val output = s"${createResult.stdout}\n${createResult.stderr}"
+    val output = s"${createResult.stdout}\n${createResult.stderr}"
 
-      output should include("main")
+    output should include("main")
   }
 
   it should "Ensure that zipped actions are encoded and uploaded as NodeJS actions" in withAssetCleaner(wskprops)
{
diff --git a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskConfigTests.scala
b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskConfigTests.scala
index d8324d7..d576e7b 100644
--- a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskConfigTests.scala
+++ b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskConfigTests.scala
@@ -241,7 +241,7 @@ class WskConfigTests extends TestHelpers with WskTestHelpers {
       val rr = wsk.cli(Seq("property", "get", "--apibuild", "-i"), env = env)
       rr.stdout should not include regex("""whisk API build\s*Unknown""")
       rr.stderr should not include regex("Unable to obtain API build information")
-      rr.stdout should include regex ("""(?i)whisk API build\s+201.*""")
+      rr.stdout should include regex ("""(?i)whisk API build\s+20.*""")
     } finally {
       tmpwskprops.delete()
     }


Mime
View raw message