[openwhisk-cli] branch master updated: Fixes for travis build. (#460)

[dubeejw]

This is an automated email from the ASF dual-hosted git repository.

dubeejw 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 ab412be  Fixes for travis build. (#460)
ab412be is described below

commit ab412bec6e1b18e491c572fb8e005cf8c9eb8695
Author: David Grove <dgrove-...@users.noreply.github.com>
AuthorDate: Tue Oct 15 18:32:30 2019 -0400

    Fixes for travis build. (#460)
    
    1. fix pip install
    2. fix for gradle5
    
    Co-authored-by: Chetan Mehrotra <chet...@apache.org>
---
 .travis.yml                                              | 4 ++--
 tests/src/test/scala/system/basic/WskCliBasicTests.scala | 2 +-
 tools/travis/test_openwhisk.sh                           | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cbeb9e7..19b3f1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,9 +21,9 @@ matrix:
   include:
     - os: linux
       sudo: required
-      group: deprecated-2017Q3
       go: "1.9.3"
       services: docker
+      dist: xenial
 
 env:
   global:
@@ -47,7 +47,7 @@ before_install:
 
 install:
   - cd $TRAVIS_BUILD_DIR/..
-  - pip install --upgrade pip setuptools
+  - pip install --user --upgrade pip setuptools
 
 before_script:
   - cd $TRAVIS_BUILD_DIR
diff --git a/tests/src/test/scala/system/basic/WskCliBasicTests.scala 
b/tests/src/test/scala/system/basic/WskCliBasicTests.scala
index a3c18f4..c3a7cf7 100644
--- a/tests/src/test/scala/system/basic/WskCliBasicTests.scala
+++ b/tests/src/test/scala/system/basic/WskCliBasicTests.scala
@@ -874,7 +874,7 @@ class WskCliBasicTests extends TestHelpers with 
WskTestHelpers {
   behavior of "Wsk Namespace CLI"
 
   def WskNsCLI_RetListOneNs_test(wsk: Wsk, wp: WskProps): Unit = {
-    val lines = wsk.namespace.list()(wp).stdout.lines.toSeq
+    val lines = wsk.namespace.list()(wp).stdout.linesIterator.toSeq
     lines should have size 2
     lines.head shouldBe "namespaces"
     lines(1).trim should not be empty
diff --git a/tools/travis/test_openwhisk.sh b/tools/travis/test_openwhisk.sh
index 20df571..c59f520 100755
--- a/tools/travis/test_openwhisk.sh
+++ b/tools/travis/test_openwhisk.sh
@@ -98,13 +98,13 @@ $ANSIBLE_CMD routemgmt.yml
 
 #  Run the test cases under openwhisk to ensure the quality of the runnint API.
 cd $TRAVIS_BUILD_DIR
-./gradlew --console=plain :tests:test -Dtest.single=*ApiGwCliTests*
+./gradlew --console=plain :tests:test --tests=*ApiGwCliTests*
 sleep 30
-./gradlew --console=plain :tests:test 
-Dtest.single=*ApiGwCliRoutemgmtActionTests*
+./gradlew --console=plain :tests:test --tests=*ApiGwCliRoutemgmtActionTests*
 sleep 30
-./gradlew --console=plain :tests:test -Dtest.single=*ApiGwCliEndToEndTests*
+./gradlew --console=plain :tests:test --tests=*ApiGwCliEndToEndTests*
 sleep 30
-./gradlew --console=plain :tests:test -Dtest.single=*Wsk*Tests*
+./gradlew --console=plain :tests:test --tests=*Wsk*Tests*
 
 #
 #  Finally, run the integration test for the CLI