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.
diff --git a/.travis.yml b/.travis.yml
index 19b3f1e..17c592c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,7 @@
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 @@
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 @@
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()
}
