lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang: Rename old fail4 variable to failGraph

Browse Source 
Cleanups...
This commit is contained in:
James Shubin
2021-05-08 04:20:05 -04:00
parent d51029e86c
commit 95ea93564e
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lang/interpret_test.go
View File

@@ -550,7 +550,7 @@ func TestAstFunc1(t *testing.T) {
const magicErrorFailInit = "errInit: " const magicErrorFailInit = "errInit: "
const magicErrorSetScope = "errSetScope: " const magicErrorSetScope = "errSetScope: "
const magicErrorUnify = "errUnify: " const magicErrorUnify = "errUnify: "
const magicError4 = "err4: " const magicErrorGraph = "errGraph: "
const magicEmpty = "# empty!" const magicEmpty = "# empty!"
dir, err := util.TestDirFull() dir, err := util.TestDirFull()
if err != nil { if err != nil {
@@ -583,7 +583,7 @@ func TestAstFunc1(t *testing.T) {
failInit bool failInit bool
failSetScope bool failSetScope bool
failUnify bool failUnify bool
fail4 bool failGraph bool
} }
type test struct { // an individual test type test struct { // an individual test
name string name string
@@ -640,7 +640,7 @@ func TestAstFunc1(t *testing.T) {
failInit := false failInit := false
failSetScope := false failSetScope := false
failUnify := false failUnify := false
fail4 := false failGraph := false
if strings.HasPrefix(str, magicError) { if strings.HasPrefix(str, magicError) {
errStr = strings.TrimPrefix(str, magicError) errStr = strings.TrimPrefix(str, magicError)
str = errStr str = errStr
@@ -665,10 +665,10 @@ func TestAstFunc1(t *testing.T) {
str = errStr str = errStr
failUnify = true failUnify = true
} }
if strings.HasPrefix(str, magicError4) { if strings.HasPrefix(str, magicErrorGraph) {
errStr = strings.TrimPrefix(str, magicError4) errStr = strings.TrimPrefix(str, magicErrorGraph)
str = errStr str = errStr
fail4 = true failGraph = true
} }
} }
@@ -683,7 +683,7 @@ func TestAstFunc1(t *testing.T) {
failInit: failInit, failInit: failInit,
failSetScope: failSetScope, failSetScope: failSetScope,
failUnify: failUnify, failUnify: failUnify,
fail4: fail4, failGraph: failGraph,
}, },
}) })
//t.Logf("adding: %s", f + "/") //t.Logf("adding: %s", f + "/")
@@ -721,7 +721,7 @@ func TestAstFunc1(t *testing.T) {
failInit := errs.failInit failInit := errs.failInit
failSetScope := errs.failSetScope failSetScope := errs.failSetScope
failUnify := errs.failUnify failUnify := errs.failUnify
fail4 := errs.fail4 failGraph := errs.failGraph
t.Logf("\n\ntest #%d (%s) ----------------\npath: %s\n\n", index, name, src) t.Logf("\n\ntest #%d (%s) ----------------\npath: %s\n\n", index, name, src)
@@ -915,12 +915,12 @@ func TestAstFunc1(t *testing.T) {
// build the function graph // build the function graph
graph, err := iast.Graph() graph, err := iast.Graph()
if (!fail || !fail4) && err != nil { if (!fail || !failGraph) && err != nil {
t.Errorf("test #%d: FAIL", index) t.Errorf("test #%d: FAIL", index)
t.Errorf("test #%d: functions failed with: %+v", index, err) t.Errorf("test #%d: functions failed with: %+v", index, err)
return return
} }
if fail4 && err != nil { // can't process graph if it's nil if failGraph && err != nil { // can't process graph if it's nil
s := err.Error() // convert to string s := err.Error() // convert to string
if s != expstr { if s != expstr {
t.Errorf("test #%d: FAIL", index) t.Errorf("test #%d: FAIL", index)
@@ -930,7 +930,7 @@ func TestAstFunc1(t *testing.T) {
} }
return return
} }
if fail4 && err == nil { if failGraph && err == nil {
t.Errorf("test #%d: FAIL", index) t.Errorf("test #%d: FAIL", index)
t.Errorf("test #%d: functions passed, expected fail", index) t.Errorf("test #%d: functions passed, expected fail", index)
return return
@@ -1004,7 +1004,7 @@ func TestAstFunc2(t *testing.T) {
// TODO: move them all down by one // TODO: move them all down by one
const magicErrorSetScope = "errSetScope: " const magicErrorSetScope = "errSetScope: "
const magicErrorUnify = "errUnify: " const magicErrorUnify = "errUnify: "
const magicError4 = "err4: " const magicErrorGraph = "errGraph: "
const magicError5 = "err5: " const magicError5 = "err5: "
const magicError6 = "err6: " const magicError6 = "err6: "
const magicEmpty = "# empty!" const magicEmpty = "# empty!"
@@ -1041,7 +1041,7 @@ func TestAstFunc2(t *testing.T) {
// TODO: move them all down by one // TODO: move them all down by one
failSetScope bool failSetScope bool
failUnify bool failUnify bool
fail4 bool failGraph bool
fail5 bool fail5 bool
fail6 bool fail6 bool
} }
@@ -1102,7 +1102,7 @@ func TestAstFunc2(t *testing.T) {
// TODO: move them all down by one // TODO: move them all down by one
failSetScope := false failSetScope := false
failUnify := false failUnify := false
fail4 := false failGraph := false
fail5 := false fail5 := false
fail6 := false fail6 := false
if strings.HasPrefix(str, magicError) { if strings.HasPrefix(str, magicError) {
@@ -1135,10 +1135,10 @@ func TestAstFunc2(t *testing.T) {
str = errStr str = errStr
failUnify = true failUnify = true
} }
if strings.HasPrefix(str, magicError4) { if strings.HasPrefix(str, magicErrorGraph) {
errStr = strings.TrimPrefix(str, magicError4) errStr = strings.TrimPrefix(str, magicErrorGraph)
str = errStr str = errStr
fail4 = true failGraph = true
} }
if strings.HasPrefix(str, magicError5) { if strings.HasPrefix(str, magicError5) {
errStr = strings.TrimPrefix(str, magicError5) errStr = strings.TrimPrefix(str, magicError5)
@@ -1165,7 +1165,7 @@ func TestAstFunc2(t *testing.T) {
// TODO: move them all down by one // TODO: move them all down by one
failSetScope: failSetScope, failSetScope: failSetScope,
failUnify: failUnify, failUnify: failUnify,
fail4: fail4, failGraph: failGraph,
fail5: fail5, fail5: fail5,
fail6: fail6, fail6: fail6,
}, },
@@ -1207,7 +1207,7 @@ func TestAstFunc2(t *testing.T) {
// TODO: move them all down by one // TODO: move them all down by one
failSetScope := errs.failSetScope failSetScope := errs.failSetScope
failUnify := errs.failUnify failUnify := errs.failUnify
fail4 := errs.fail4 failGraph := errs.failGraph
fail5 := errs.fail5 fail5 := errs.fail5
fail6 := errs.fail6 fail6 := errs.fail6
@@ -1432,12 +1432,12 @@ func TestAstFunc2(t *testing.T) {
// build the function graph // build the function graph
graph, err := iast.Graph() graph, err := iast.Graph()
if (!fail || !fail4) && err != nil { if (!fail || !failGraph) && err != nil {
t.Errorf("test #%d: FAIL", index) t.Errorf("test #%d: FAIL", index)
t.Errorf("test #%d: functions failed with: %+v", index, err) t.Errorf("test #%d: functions failed with: %+v", index, err)
return return
} }
if fail4 && err != nil { // can't process graph if it's nil if failGraph && err != nil { // can't process graph if it's nil
s := err.Error() // convert to string s := err.Error() // convert to string
if s != expstr { if s != expstr {
t.Errorf("test #%d: FAIL", index) t.Errorf("test #%d: FAIL", index)
@@ -1447,7 +1447,7 @@ func TestAstFunc2(t *testing.T) {
} }
return return
} }
if fail4 && err == nil { if failGraph && err == nil {
t.Errorf("test #%d: FAIL", index) t.Errorf("test #%d: FAIL", index)
t.Errorf("test #%d: functions passed, expected fail", index) t.Errorf("test #%d: functions passed, expected fail", index)
return return

2
lang/interpret_test/TestAstFunc1/resdupefields0.graph
View File

@@ -1 +1 @@
# err: err4: resource has duplicate meta entry of: noop # err: errGraph: resource has duplicate meta entry of: noop