pritidesai closed pull request #987: update managed integration test
URL: https://github.com/apache/incubator-openwhisk-wskdeploy/pull/987
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 2ee9ccdd..af613f4d 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 c228f985..a455e95e 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.")
+//}
diff --git a/wski18n/i18n_resources.go b/wski18n/i18n_resources.go
index 2a1c6432..e397a0b0 100644
--- a/wski18n/i18n_resources.go
+++ b/wski18n/i18n_resources.go
@@ -329,14 +329,14 @@ func AssetNames() []string {
// _bindata is a table, holding each asset generator, mapped to its name.
var _bindata = map[string]func() (*asset, error){
- "wski18n/resources/de_DE.all.json": wski18nResourcesDe_deAllJson,
- "wski18n/resources/en_US.all.json": wski18nResourcesEn_usAllJson,
- "wski18n/resources/es_ES.all.json": wski18nResourcesEs_esAllJson,
- "wski18n/resources/fr_FR.all.json": wski18nResourcesFr_frAllJson,
- "wski18n/resources/it_IT.all.json": wski18nResourcesIt_itAllJson,
- "wski18n/resources/ja_JA.all.json": wski18nResourcesJa_jaAllJson,
- "wski18n/resources/ko_KR.all.json": wski18nResourcesKo_krAllJson,
- "wski18n/resources/pt_BR.all.json": wski18nResourcesPt_brAllJson,
+ "wski18n/resources/de_DE.all.json": wski18nResourcesDe_deAllJson,
+ "wski18n/resources/en_US.all.json": wski18nResourcesEn_usAllJson,
+ "wski18n/resources/es_ES.all.json": wski18nResourcesEs_esAllJson,
+ "wski18n/resources/fr_FR.all.json": wski18nResourcesFr_frAllJson,
+ "wski18n/resources/it_IT.all.json": wski18nResourcesIt_itAllJson,
+ "wski18n/resources/ja_JA.all.json": wski18nResourcesJa_jaAllJson,
+ "wski18n/resources/ko_KR.all.json": wski18nResourcesKo_krAllJson,
+ "wski18n/resources/pt_BR.all.json": wski18nResourcesPt_brAllJson,
"wski18n/resources/zh_Hans.all.json": wski18nResourcesZh_hansAllJson,
"wski18n/resources/zh_Hant.all.json": wski18nResourcesZh_hantAllJson,
}
@@ -380,17 +380,18 @@ type bintree struct {
Func func() (*asset, error)
Children map[string]*bintree
}
+
var _bintree = &bintree{nil, map[string]*bintree{
"wski18n": &bintree{nil, map[string]*bintree{
"resources": &bintree{nil, map[string]*bintree{
- "de_DE.all.json":
&bintree{wski18nResourcesDe_deAllJson, map[string]*bintree{}},
- "en_US.all.json":
&bintree{wski18nResourcesEn_usAllJson, map[string]*bintree{}},
- "es_ES.all.json":
&bintree{wski18nResourcesEs_esAllJson, map[string]*bintree{}},
- "fr_FR.all.json":
&bintree{wski18nResourcesFr_frAllJson, map[string]*bintree{}},
- "it_IT.all.json":
&bintree{wski18nResourcesIt_itAllJson, map[string]*bintree{}},
- "ja_JA.all.json":
&bintree{wski18nResourcesJa_jaAllJson, map[string]*bintree{}},
- "ko_KR.all.json":
&bintree{wski18nResourcesKo_krAllJson, map[string]*bintree{}},
- "pt_BR.all.json":
&bintree{wski18nResourcesPt_brAllJson, map[string]*bintree{}},
+ "de_DE.all.json":
&bintree{wski18nResourcesDe_deAllJson, map[string]*bintree{}},
+ "en_US.all.json":
&bintree{wski18nResourcesEn_usAllJson, map[string]*bintree{}},
+ "es_ES.all.json":
&bintree{wski18nResourcesEs_esAllJson, map[string]*bintree{}},
+ "fr_FR.all.json":
&bintree{wski18nResourcesFr_frAllJson, map[string]*bintree{}},
+ "it_IT.all.json":
&bintree{wski18nResourcesIt_itAllJson, map[string]*bintree{}},
+ "ja_JA.all.json":
&bintree{wski18nResourcesJa_jaAllJson, map[string]*bintree{}},
+ "ko_KR.all.json":
&bintree{wski18nResourcesKo_krAllJson, map[string]*bintree{}},
+ "pt_BR.all.json":
&bintree{wski18nResourcesPt_brAllJson, map[string]*bintree{}},
"zh_Hans.all.json":
&bintree{wski18nResourcesZh_hansAllJson, map[string]*bintree{}},
"zh_Hant.all.json":
&bintree{wski18nResourcesZh_hantAllJson, map[string]*bintree{}},
}},
@@ -443,4 +444,3 @@ func _filePath(dir, name string) string {
cannonicalName := strings.Replace(name, "\\", "/", -1)
return filepath.Join(append([]string{dir},
strings.Split(cannonicalName, "/")...)...)
}
-
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
