[incubator-openwhisk-wskdeploy] branch master updated: introducing deployment to IBM cloud functions using exported manifest (#939)

[houshengbo]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 0934bd9  introducing deployment to IBM cloud functions using exported 
manifest (#939)
0934bd9 is described below

commit 0934bd92f706c7ab72991bc2a6f89efebcae1a79
Author: Priti Desai <pde...@us.ibm.com>
AuthorDate: Thu May 24 18:05:18 2018 -0700

    introducing deployment to IBM cloud functions using exported manifest (#939)
---
 tests/src/integration/export/export_test.go | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/tests/src/integration/export/export_test.go 
b/tests/src/integration/export/export_test.go
index 7e2a0bc..c976ff6 100644
--- a/tests/src/integration/export/export_test.go
+++ b/tests/src/integration/export/export_test.go
@@ -20,6 +20,7 @@
 package tests
 
 import (
+       "fmt"
        "os"
        "testing"
 
@@ -78,11 +79,19 @@ func TestExportHelloWorld(t *testing.T) {
        _, err = wskdeploy.UndeployManifestPathOnly(manifestHelloWorldPath)
        assert.Equal(t, nil, err, "Failed to undeploy")
 
-       _, err = 
wskdeploy.ManagedDeploymentManifestAndProject(targetManifestHelloWorldPath, 
projectName)
-       assert.Equal(t, nil, err, "Failed to redeploy exported project.")
-
-       _, err = 
wskdeploy.UndeployManifestPathOnly(targetManifestHelloWorldPath)
-       assert.Equal(t, nil, err, "Failed to undeploy exported project")
+       wskprops := common.GetWskpropsFromEnvVars(common.BLUEMIX_APIHOST, 
common.BLUEMIX_NAMESPACE, common.BLUEMIX_AUTH)
+       err = common.ValidateWskprops(wskprops)
+       if err != nil {
+               fmt.Println(err.Error())
+               fmt.Println("Wsk properties are not properly configured, so 
tests are skipped.")
+       } else {
+               wskdeploy := common.NewWskdeploy()
+               _, err = 
wskdeploy.ManagedDeploymentManifestAndProject(targetManifestHelloWorldPath, 
projectName)
+               assert.Equal(t, nil, err, "Failed to redeploy exported 
project.")
+
+               _, err = 
wskdeploy.UndeployManifestPathOnly(targetManifestHelloWorldPath)
+               assert.Equal(t, nil, err, "Failed to undeploy exported project")
+       }
 }
 
 func TestExport2Pack(t *testing.T) {

-- 
To stop receiving notification emails like this one, please contact
houshen...@apache.org.