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 c63778c Rename manifest and deployment yaml files to meaningful name
(#566)
c63778c is described below
commit c63778c23d84518e2f01843f5fb874b57fc79898
Author: Ying Chun Guo <guoyi...@cn.ibm.com>
AuthorDate: Fri Sep 29 21:44:37 2017 +0800
Rename manifest and deployment yaml files to meaningful name (#566)
---
parsers/manifest_parser_test.go | 8 ++++----
parsers/yamlparser_test.go | 15 ++++++---------
tests/dat/deploy3.yaml | 12 ------------
.../dat/{deploy4.yaml => deployment_compose_trigger.yaml} | 0
tests/dat/{manifest5.yaml => manifest_validate_feed.yaml} | 1 -
.../dat/{manifest6.yaml => manifest_validate_params.yaml} | 0
tests/dat/{manifest4.yaml => manifest_validate_rule.yaml} | 2 +-
...{manifest3.yaml => manifest_validate_triggerfeed.yaml} | 2 +-
8 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/parsers/manifest_parser_test.go b/parsers/manifest_parser_test.go
index 0048b58..f282153 100644
--- a/parsers/manifest_parser_test.go
+++ b/parsers/manifest_parser_test.go
@@ -1373,7 +1373,7 @@ packages:
}
func TestParseManifestYAML_trigger(t *testing.T) {
- data, err := ioutil.ReadFile("../tests/dat/manifest3.yaml")
+ data, err :=
ioutil.ReadFile("../tests/dat/manifest_validate_triggerfeed.yaml")
if err != nil {
panic(err)
}
@@ -1400,7 +1400,7 @@ func TestParseManifestYAML_trigger(t *testing.T) {
}
func TestParseManifestYAML_rule(t *testing.T) {
- data, err := ioutil.ReadFile("../tests/dat/manifest4.yaml")
+ data, err := ioutil.ReadFile("../tests/dat/manifest_validate_rule.yaml")
if err != nil {
panic(err)
}
@@ -1428,7 +1428,7 @@ func TestParseManifestYAML_rule(t *testing.T) {
}
func TestParseManifestYAML_feed(t *testing.T) {
- data, err := ioutil.ReadFile("../tests/dat/manifest5.yaml")
+ data, err := ioutil.ReadFile("../tests/dat/manifest_validate_feed.yaml")
if err != nil {
panic(err)
}
@@ -1464,7 +1464,7 @@ func TestParseManifestYAML_feed(t *testing.T) {
}
func TestParseManifestYAML_param(t *testing.T) {
- data, err := ioutil.ReadFile("../tests/dat/manifest6.yaml")
+ data, err :=
ioutil.ReadFile("../tests/dat/manifest_validate_params.yaml")
if err != nil {
panic(err)
}
diff --git a/parsers/yamlparser_test.go b/parsers/yamlparser_test.go
index d27a5f8..3cc58c7 100644
--- a/parsers/yamlparser_test.go
+++ b/parsers/yamlparser_test.go
@@ -26,14 +26,11 @@ import (
var manifestfile_val_pkg =
"../tests/dat/manifest_validate_package_grammar.yaml"
var manifestfile_val_tar =
"../tests/dat/manifest_validate_trigger_action_rule_grammar.yaml"
-var manifestfile3 = "../tests/dat/manifest3.yaml"
-var manifestfile4 = "../tests/dat/manifest4.yaml"
-var manifestfile5 = "../tests/dat/manifest5.yaml"
-var manifestfile6 = "../tests/dat/manifest6.yaml"
+var manifest_validate_triggerfeed =
"../tests/dat/manifest_validate_triggerfeed.yaml"
+var manifest_validate_rule = "../tests/dat/manifest_validate_rule.yaml"
var deploymentfile_data_app = "../tests/dat/deployment_data_application.yaml"
var deploymentfile_data_app_pkg =
"../tests/dat/deployment_data_application_package.yaml"
-var testfile3 = "../tests/dat/deploy3.yaml"
-var testfile4 = "../tests/dat/deploy4.yaml"
+var deployment_compose_trigger = "../tests/dat/deployment_compose_trigger.yaml"
func TestComposeWskPackage(t *testing.T) {
@@ -57,8 +54,8 @@ func TestComposeWskPackage(t *testing.T) {
func TestComposeWskTrigger(t *testing.T) {
mm := NewYAMLParser()
- deployment, _ := mm.ParseDeployment(testfile4)
- manifest, _ := mm.ParseManifest(manifestfile3)
+ deployment, _ := mm.ParseDeployment(deployment_compose_trigger)
+ manifest, _ := mm.ParseManifest(manifest_validate_triggerfeed)
pkg := deployment.Application.GetPackageList()[0]
for _, trigger := range pkg.GetTriggerList() {
@@ -83,7 +80,7 @@ func TestComposeWskTrigger(t *testing.T) {
func TestComposeWskRule(t *testing.T) {
mm := NewYAMLParser()
- manifest, _ := mm.ParseManifest(manifestfile4)
+ manifest, _ := mm.ParseManifest(manifest_validate_rule)
pkg := manifest.Package
for _, rule := range pkg.GetRuleList() {
diff --git a/tests/dat/deploy3.yaml b/tests/dat/deploy3.yaml
deleted file mode 100644
index 56dfa31..0000000
--- a/tests/dat/deploy3.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-application:
- name: wskdeploy-samples
- namespace: /wskdeploy/samples/
-
- packages:
- test_package:
- actions:
- hello:
- namespace: /wskdeploy/samples/test/hello
- credential: 12345678ABCDEF
- inputs:
- name: Bernie
diff --git a/tests/dat/deploy4.yaml b/tests/dat/deployment_compose_trigger.yaml
similarity index 100%
rename from tests/dat/deploy4.yaml
rename to tests/dat/deployment_compose_trigger.yaml
diff --git a/tests/dat/manifest5.yaml b/tests/dat/manifest_validate_feed.yaml
similarity index 96%
rename from tests/dat/manifest5.yaml
rename to tests/dat/manifest_validate_feed.yaml
index 12ce24c..19ec342 100644
--- a/tests/dat/manifest5.yaml
+++ b/tests/dat/manifest_validate_feed.yaml
@@ -8,4 +8,3 @@ packages:
operation1:
operation2:
-
diff --git a/tests/dat/manifest6.yaml b/tests/dat/manifest_validate_params.yaml
similarity index 100%
rename from tests/dat/manifest6.yaml
rename to tests/dat/manifest_validate_params.yaml
diff --git a/tests/dat/manifest4.yaml b/tests/dat/manifest_validate_rule.yaml
similarity index 94%
rename from tests/dat/manifest4.yaml
rename to tests/dat/manifest_validate_rule.yaml
index 024be0d..65ddbb4 100644
--- a/tests/dat/manifest4.yaml
+++ b/tests/dat/manifest_validate_rule.yaml
@@ -5,4 +5,4 @@ packages:
trigger: trigger1
action: hellpworld
rule: true
-
+
diff --git a/tests/dat/manifest3.yaml
b/tests/dat/manifest_validate_triggerfeed.yaml
similarity index 92%
rename from tests/dat/manifest3.yaml
rename to tests/dat/manifest_validate_triggerfeed.yaml
index 80296c3..2b1186a 100644
--- a/tests/dat/manifest3.yaml
+++ b/tests/dat/manifest_validate_triggerfeed.yaml
@@ -4,4 +4,4 @@ packages:
trigger1:
trigger2:
feed: myfeed
-
+
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].
