This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git
The following commit(s) were added to refs/heads/master by this push: new caf748d Remove heisenbug from test by checking either order for stdout/stderr lines. (#2761) (#105) caf748d is described below commit caf748de09d762167f123fd9683df8890832d091 Author: Vincent <s...@us.ibm.com> AuthorDate: Mon Sep 18 17:43:13 2017 -0400 Remove heisenbug from test by checking either order for stdout/stderr lines. (#2761) (#105) --- .travis.yml | 12 +----------- .../test/scala/whisk/core/cli/test/WskBasicUsageTests.scala | 5 ++++- tools/travis/build_tag_releases.sh | 11 +---------- tools/travis/test_openwhisk.sh | 8 ++++++++ 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7864831..8320058 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,6 @@ matrix: env: secure: "Br0fD9CAKm8gqyEuwmltNJd4dGJCxPpj6feugHlO+CFFwfE/+kJKkpTlsDuRfrUzUDlWiETNPf0XGSjvPFqZExnLCE9XQh2+XF6u+S3YBWfM+rbbyRVAK6BlTwmt0u3jRJ2JP7spedTGZA+qfIWI+UkwoOexo7NcqtMPLahiZzheaaad8y3J+crHQCrB/kPrhLqKVMEOkIbveFdfV2QLfCOWgqP8e1LGZhPZ2N4QcNo0iB5uI4ZyYszTZDniXFKxz7kBs4tl4ZQDqRHqL02qKPsjbvjrZp83ql+PbC2dpgXi9YpaDuBEqKKX1rTQP5ppcwbobot5U3ItHWzpXbLCdsWxvbde/0enjMmOF1wwl71hPYIf7PkQmNAWXRtL2Z1TguO/dKCeXBLDER4YDQ79GYpikAMqnrRLou4rsyZrNUzg8aHbELzAHppDSpqEJN8ymGgWgmWBT8yPaWVwN5CjPFO [...] services: docker - - os: osx - go: 1.8 git: depth: 3 @@ -28,15 +26,7 @@ install: - go get -u github.com/spf13/viper script: - - ./tools/travis/scancode.sh - - make lint - - make build - - make test - - export PATH=$PATH:$TRAVIS_BUILD_DIR; - - make native_test; - - if [ "$TRAVIS_OS_NAME" == "linux" ] ; then - ./tools/travis/test_openwhisk.sh; - fi + - ./tools/travis/test_openwhisk.sh after_script: - make clean diff --git a/tests/src/test/scala/whisk/core/cli/test/WskBasicUsageTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskBasicUsageTests.scala index ba2f865..82c3693 100644 --- a/tests/src/test/scala/whisk/core/cli/test/WskBasicUsageTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/WskBasicUsageTests.scala @@ -320,7 +320,10 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { withActivation(wsk.activation, wsk.action.invoke(name)) { activation => val cmd = Seq("activation", "logs", "--strip", activation.activationId) val run = wsk.cli(cmd ++ wskprops.overrides ++ auth, expectedExitCode = SUCCESS_EXIT) - run.stdout shouldBe "this is stdout\nthis is stderr\n" + run.stdout should { + be("this is stdout\nthis is stderr\n") or + be("this is stderr\nthis is stdout\n") + } } } diff --git a/tools/travis/build_tag_releases.sh b/tools/travis/build_tag_releases.sh index 621bcb4..a5dc9a0 100755 --- a/tools/travis/build_tag_releases.sh +++ b/tools/travis/build_tag_releases.sh @@ -1,18 +1,9 @@ #!/usr/bin/env bash -declare -a os_list=() +declare -a os_list=("linux" "windows" "darwin") declare -a arc_list=("amd64" "386") build_file_name=${1:-"wsk"} zip_file_name=${2:-"OpenWhisk_CLI"} -os=$TRAVIS_OS_NAME - -if [[ $TRAVIS_OS_NAME == 'linux' ]]; then - # Currently we have not set up the CI designated to build windows binaries, so we tentatively - # add the windows build into the linux CI environment. - os_list=("linux" "windows") -elif [[ $TRAVIS_OS_NAME == 'osx' ]]; then - os_list=("darwin") -fi for os in "${os_list[@]}" do diff --git a/tools/travis/test_openwhisk.sh b/tools/travis/test_openwhisk.sh index 699c2df..c2bcc2c 100755 --- a/tools/travis/test_openwhisk.sh +++ b/tools/travis/test_openwhisk.sh @@ -2,6 +2,14 @@ set -e +cd $TRAVIS_BUILD_DIR +./tools/travis/scancode.sh +make lint +make build +make test +export PATH=$PATH:$TRAVIS_BUILD_DIR; +make native_test; + export OPENWHISK_HOME="$(dirname "$TRAVIS_BUILD_DIR")/incubator-openwhisk"; HOMEDIR="$(dirname "$TRAVIS_BUILD_DIR")" cd $HOMEDIR -- To stop receiving notification emails like this one, please contact ['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].