Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down