This is an automated email from the ASF dual-hosted git repository.
pdesai 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 7b1f473 update integration test (#987)
7b1f473 is described below
commit 7b1f4739abf19a57e459c4bb2539977d55253785
Author: Priti Desai <pde...@us.ibm.com>
AuthorDate: Thu Sep 13 13:54:12 2018 -0700
update integration test (#987)
---
.../07-manifest-with-dependency.yaml | 20 ++++++-------
.../managed-deployment/managed-deployment_test.go | 33 +++++++++++++++-------
2 files changed, 32 insertions(+), 21 deletions(-)
diff --git
a/tests/src/integration/managed-deployment/07-manifest-with-dependency.yaml
b/tests/src/integration/managed-deployment/07-manifest-with-dependency.yaml
index 2ee9ccd..af613f4 100644
--- a/tests/src/integration/managed-deployment/07-manifest-with-dependency.yaml
+++ b/tests/src/integration/managed-deployment/07-manifest-with-dependency.yaml
@@ -2,26 +2,24 @@
# license agreements; and to You under the Apache License, Version 2.0.
project:
- name: MyManagedProjectWithDependency
+ name: MyManagedProjectWithMultipleDependency
packages:
Extension2:
dependencies:
- helloworlds:
- location:
github.com/apache/incubator-openwhisk-test/packages/helloworlds
- custom-hellowhisk:
+ hellowhisk-with-managed-project:
location:
github.com/apache/incubator-openwhisk-test/packages/hellowhisk
- custom-helloworlds:
+ helloworlds-with-managed-project:
location:
github.com/apache/incubator-openwhisk-test/packages/helloworlds
sequences:
helloworld-sequence:
- actions: custom-helloworlds/hello-js,
custom-hellowhisk/greeting, helloworlds/hello-js
+ actions: helloworlds-with-managed-project/hello-js,
hellowhisk-with-managed-project/greeting
triggers:
- trigger1:
- trigger2:
+ trigger1InMultipleDep:
+ trigger2InMultipleDep:
rules:
rule1:
- trigger: trigger1
+ trigger: trigger1InMultipleDep
action: helloworld-sequence
rule2:
- trigger: trigger2
- action: custom-helloworlds/helloworld-js
+ trigger: trigger2InMultipleDep
+ action: helloworlds-with-managed-project/helloworld-js
diff --git
a/tests/src/integration/managed-deployment/managed-deployment_test.go
b/tests/src/integration/managed-deployment/managed-deployment_test.go
index c228f98..a455e95 100644
--- a/tests/src/integration/managed-deployment/managed-deployment_test.go
+++ b/tests/src/integration/managed-deployment/managed-deployment_test.go
@@ -56,8 +56,13 @@ func TestManagedDeployment(t *testing.T) {
_, err = wskdeploy.ManagedDeployment(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and
deployment files.")
- manifestPath = os.Getenv("GOPATH") + PATH + "05-manifest-headless.yaml"
- _, err = wskdeploy.HeadlessManagedDeployment(manifestPath,
deploymentPath, "Headless Managed")
+}
+
+func TestHeadlessManagedDeployment(t *testing.T) {
+ manifestPath := os.Getenv("GOPATH") + PATH + "05-manifest-headless.yaml"
+ deploymentPath := ""
+ wskdeploy := common.NewWskdeploy()
+ _, err := wskdeploy.HeadlessManagedDeployment(manifestPath,
deploymentPath, "HeadlessManaged")
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and
deployment files.")
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and
deployment files.")
@@ -72,16 +77,24 @@ func TestManagedDeploymentWithDependency(t *testing.T) {
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and
deployment files.")
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and
deployment files.")
+}
- manifestPath = os.Getenv("GOPATH") + PATH +
"07-manifest-with-dependency.yaml"
- _, err = wskdeploy.ManagedDeployment(manifestPath, deploymentPath)
+func TestManagedDeploymentWithMultipleDependency(t *testing.T) {
+ manifestPath := os.Getenv("GOPATH") + PATH +
"07-manifest-with-dependency.yaml"
+ deploymentPath := ""
+ wskdeploy := common.NewWskdeploy()
+ _, err := wskdeploy.ManagedDeployment(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and
deployment files.")
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and
deployment files.")
-
- //manifestPath = os.Getenv("GOPATH") + PATH +
"08-manifest-with-dependencies-on-whisk-system.yaml"
- //_, err = wskdeploy.ManagedDeployment(manifestPath, deploymentPath)
- //assert.Equal(t, nil, err, "Failed to deploy based on the manifest and
deployment files.")
- //_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
- //assert.Equal(t, nil, err, "Failed to deploy based on the manifest and
deployment files.")
}
+
+//func TestManagedDeploymentWithWhiskSystem(t *testing.T) {
+//manifestPath := os.Getenv("GOPATH") + PATH +
"08-manifest-with-dependencies-on-whisk-system.yaml"
+//deploymentPath := ""
+//wskdeploy := common.NewWskdeploy()
+//_, err := wskdeploy.ManagedDeployment(manifestPath, deploymentPath)
+//assert.Equal(t, nil, err, "Failed to deploy based on the manifest and
deployment files.")
+//_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
+//assert.Equal(t, nil, err, "Failed to deploy based on the manifest and
deployment files.")
+//}
