[incubator-openwhisk-wskdeploy] branch master updated: Adding fix for web action integration test (#403)

[mr...@apache.org]

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-wskdeploy.git


The following commit(s) were added to refs/heads/master by this push:
     new 490520e  Adding fix for web action integration test (#403)
490520e is described below

commit 490520e4c3192f7759b6804807a2f59859a67d54
Author: Priti Desai <pd...@us.ibm.com>
AuthorDate: Mon Aug 28 19:25:41 2017 -0700

    Adding fix for web action integration test (#403)
---
 tests/src/integration/webaction/deployment.yml    | 12 ------------
 tests/src/integration/webaction/manifest.yml      | 12 ++++--------
 tests/src/integration/webaction/webaction_test.go |  8 ++++----
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/tests/src/integration/webaction/deployment.yml b/tests/src/integration/webaction/deployment.yml
deleted file mode 100644
index 848e52d..0000000
--- a/tests/src/integration/webaction/deployment.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-application:
-  name: wskdeploy-samples
-
-  package:
-    triggerrule:
-      name: helloworld
-      namespace: guest
-      actions:
-        greeting:
-          inputs:
-            name: Bernie
-            place: Vermont
diff --git a/tests/src/integration/webaction/manifest.yml b/tests/src/integration/webaction/manifest.yml
index 0785fd9..6db70f5 100644
--- a/tests/src/integration/webaction/manifest.yml
+++ b/tests/src/integration/webaction/manifest.yml
@@ -1,7 +1,5 @@
 package:
-  name: helloworld
-  version: 1.0
-  license: Apache-2.0
+  name: IntegrationTestWebAction
   actions:
     greeting:
       web-export: true
@@ -14,11 +12,9 @@ package:
       outputs:
         payload: string
   triggers:
-    locationUpdate:
+    webActionTrigger:
   rules:
-    myRule:
-      trigger: locationUpdate
-      #the action name and the action file greeting.js should consistent.
-      #currently the implementation deside the action name consistent with action file name?
+    webActionRule:
+      trigger: webActionTrigger
       action: greeting
 
diff --git a/tests/src/integration/webaction/webaction_test.go b/tests/src/integration/webaction/webaction_test.go
index a5b4d20..5ec81ca 100644
--- a/tests/src/integration/webaction/webaction_test.go
+++ b/tests/src/integration/webaction/webaction_test.go
@@ -1,4 +1,4 @@
-// +build not_integration
+// +build integration
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,12 +33,12 @@ var wskprops = common.GetWskprops()
 func TestWebAction(t *testing.T) {
 	wskdeploy := common.NewWskdeploy()
 	_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
-	assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+	assert.Equal(t, nil, err, "Failed to deploy based on the manifest file.")
 	_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
-	assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files.")
+	assert.Equal(t, nil, err, "Failed to undeploy based on the manifest file.")
 }
 
 var (
 	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/webaction/manifest.yml"
-	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/webaction/deployment.yml"
+	deploymentPath = ""
 )

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].