openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mrutkow...@apache.org
Subject [incubator-openwhisk-wskdeploy] branch master updated: Use "YAML: Parsing errors:" as the header for parsing erros (#593)
Date Thu, 05 Oct 2017 17:28:38 GMT
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 079b3f5  Use "YAML: Parsing errors:" as the header for parsing erros (#593)
079b3f5 is described below

commit 079b3f53f2bf4457e252b3ce320eac27fe735051
Author: Vincent <shou@us.ibm.com>
AuthorDate: Thu Oct 5 13:28:36 2017 -0400

    Use "YAML: Parsing errors:" as the header for parsing erros (#593)
    
    Closes #506
---
 parsers/deploy_parser_test.go   | 6 +++---
 parsers/manifest_parser_test.go | 6 +++---
 utils/wskdeployerror.go         | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/parsers/deploy_parser_test.go b/parsers/deploy_parser_test.go
index 781e522..2dea01b 100644
--- a/parsers/deploy_parser_test.go
+++ b/parsers/deploy_parser_test.go
@@ -55,7 +55,7 @@ func TestInvalidKeyDeploymentYaml(t *testing.T) {
     _, err = p.ParseDeployment(tmpfile.Name())
     assert.NotNil(t, err)
     // go-yaml/yaml prints the wrong line number for mapping values. It should be 3.
-    assert.Contains(t, err.Error(), "field invalidKey not found in struct parsers.Application:
Line 2, its neighbour lines, or the lines on the same level")
+    assert.Contains(t, err.Error(), "field invalidKey not found in struct parsers.Application:
Line 2, its neighbor lines, or the lines on the same level")
 }
 
 func TestMappingValueDeploymentYaml(t *testing.T) {
@@ -74,7 +74,7 @@ func TestMappingValueDeploymentYaml(t *testing.T) {
     _, err = p.ParseDeployment(tmpfile.Name())
     assert.NotNil(t, err)
     // go-yaml/yaml prints the wrong line number for mapping values. It should be 3.
-    assert.Contains(t, err.Error(), "mapping values are not allowed in this context: Line
2, its neighbour lines, or the lines on the same level")
+    assert.Contains(t, err.Error(), "mapping values are not allowed in this context: Line
2, its neighbor lines, or the lines on the same level")
 }
 
 func TestMissingRootNodeDeploymentYaml(t *testing.T) {
@@ -91,7 +91,7 @@ func TestMissingRootNodeDeploymentYaml(t *testing.T) {
     _, err = p.ParseDeployment(tmpfile.Name())
     assert.NotNil(t, err)
     // go-yaml/yaml prints the wrong line number for mapping values. It should be 3.
-    assert.Contains(t, err.Error(), "field name not found in struct parsers.YAML: Line 1,
its neighbour lines, or the lines on the same level")
+    assert.Contains(t, err.Error(), "field name not found in struct parsers.YAML: Line 1,
its neighbor lines, or the lines on the same level")
 }
 
 func TestParseDeploymentYAML_Application(t *testing.T) {
diff --git a/parsers/manifest_parser_test.go b/parsers/manifest_parser_test.go
index 7e68fc4..cd1038c 100644
--- a/parsers/manifest_parser_test.go
+++ b/parsers/manifest_parser_test.go
@@ -1256,7 +1256,7 @@ func TestInvalidKeyManifestYaml(t *testing.T) {
     _, err = p.ParseManifest(tmpfile.Name())
     assert.NotNil(t, err)
     // go-yaml/yaml prints the wrong line number for mapping values. It should be 4.
-    assert.Contains(t, err.Error(), "field invalidKey not found in struct parsers.Package:
Line 2, its neighbour lines, or the lines on the same level")
+    assert.Contains(t, err.Error(), "field invalidKey not found in struct parsers.Package:
Line 2, its neighbor lines, or the lines on the same level")
 }
 
 func TestMappingValueManifestYaml(t *testing.T) {
@@ -1277,7 +1277,7 @@ func TestMappingValueManifestYaml(t *testing.T) {
     _, err = p.ParseManifest(tmpfile.Name())
     assert.NotNil(t, err)
     // go-yaml/yaml prints the wrong line number for mapping values. It should be 5.
-    assert.Contains(t, err.Error(), "mapping values are not allowed in this context: Line
4, its neighbour lines, or the lines on the same level")
+    assert.Contains(t, err.Error(), "mapping values are not allowed in this context: Line
4, its neighbor lines, or the lines on the same level")
 }
 
 func TestMissingRootValueManifestYaml(t *testing.T) {
@@ -1295,7 +1295,7 @@ func TestMissingRootValueManifestYaml(t *testing.T) {
     p := NewYAMLParser()
     _, err = p.ParseManifest(tmpfile.Name())
     assert.NotNil(t, err)
-    assert.Contains(t, err.Error(), "field actions not found in struct parsers.YAML: Line
1, its neighbour lines, or the lines on the same level")
+    assert.Contains(t, err.Error(), "field actions not found in struct parsers.YAML: Line
1, its neighbor lines, or the lines on the same level")
 
 }
 
diff --git a/utils/wskdeployerror.go b/utils/wskdeployerror.go
index decd13d..3037434 100644
--- a/utils/wskdeployerror.go
+++ b/utils/wskdeployerror.go
@@ -31,6 +31,7 @@ const (
     MANIFEST_NOT_FOUND = INVALID_YAML_INPUT
     UNKNOWN = "Unknown"
     LINE = "line"
+    PARSING_ERR = "YAML: Parsing errors:"
 )
 
 type TestCaseError struct {
@@ -186,9 +187,9 @@ func (e *ParserErr) Error() string {
     for index, each := range e.msgs {
         var s string
         if e.lines[index] == UNKNOWN {
-            s = fmt.Sprintf("%s", each)
+            s = fmt.Sprintf("%s", PARSING_ERR)
         } else {
-            s = fmt.Sprintf("%s: Line %s, its neighbour lines, or the lines on the same level.",
each, e.lines[index])
+            s = fmt.Sprintf("%s: Line %s, its neighbor lines, or the lines on the same level.",
each, e.lines[index])
         }
         result[index] = s
     }

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

Mime
View raw message