1
0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00

Vet and Lint the entire system (#296)

* govet and golint corrections
This commit is contained in:
Tom Limoncelli
2018-01-09 12:53:16 -05:00
committed by GitHub
parent 1a91a7f536
commit b7c251190f
64 changed files with 540 additions and 433 deletions

View File

@ -21,7 +21,7 @@ func TestIPToUint(t *testing.T) {
}
}
func Test_DecodeTransformTable_failures(t *testing.T) {
func TestDecodeTransformTableFailures(t *testing.T) {
result, err := DecodeTransformTable("1.2.3.4 ~ 3.4.5.6")
if result != nil {
t.Errorf("expected nil, got (%v)\n", result)
@ -31,7 +31,7 @@ func Test_DecodeTransformTable_failures(t *testing.T) {
}
}
func test_ip(t *testing.T, test string, expected string, actual net.IP) {
func testIP(t *testing.T, test string, expected string, actual net.IP) {
if !net.ParseIP(expected).Equal(actual) {
t.Errorf("Test %v: expected Low (%v), got (%v)\n", test, actual, expected)
}
@ -45,10 +45,10 @@ func Test_DecodeTransformTable_0(t *testing.T) {
if len(result) != 1 {
t.Errorf("Test %v: expected col length (%v), got (%v)\n", 1, 1, len(result))
}
test_ip(t, "low", "1.2.3.4", result[0].Low)
test_ip(t, "high", "2.3.4.5", result[0].High)
test_ip(t, "newBase", "3.4.5.6", result[0].NewBases[0])
//test_ip(t, "newIP", "", result[0].NewIPs)
testIP(t, "low", "1.2.3.4", result[0].Low)
testIP(t, "high", "2.3.4.5", result[0].High)
testIP(t, "newBase", "3.4.5.6", result[0].NewBases[0])
// test_ip(t, "newIP", "", result[0].NewIPs)
}
func Test_DecodeTransformTable_1(t *testing.T) {
@ -59,14 +59,14 @@ func Test_DecodeTransformTable_1(t *testing.T) {
if len(result) != 2 {
t.Errorf("Test %v: expected col length (%v), got (%v)\n", 1, 2, len(result))
}
test_ip(t, "Low[0]", "1.2.3.4", result[0].Low)
test_ip(t, "High[0]", "2.3.4.5", result[0].High)
test_ip(t, "NewBase[0]", "3.4.5.6", result[0].NewBases[0])
//test_ip(t, "newIP[0]", "", result[0].NewIP)
test_ip(t, "Low[1]", "8.7.6.5", result[1].Low)
test_ip(t, "High[1]", "9.8.7.6", result[1].High)
test_ip(t, "NewBase[1]", "7.6.5.4", result[1].NewBases[0])
//test_ip(t, "newIP[1]", "", result[0].NewIP)
testIP(t, "Low[0]", "1.2.3.4", result[0].Low)
testIP(t, "High[0]", "2.3.4.5", result[0].High)
testIP(t, "NewBase[0]", "3.4.5.6", result[0].NewBases[0])
// test_ip(t, "newIP[0]", "", result[0].NewIP)
testIP(t, "Low[1]", "8.7.6.5", result[1].Low)
testIP(t, "High[1]", "9.8.7.6", result[1].High)
testIP(t, "NewBase[1]", "7.6.5.4", result[1].NewBases[0])
// test_ip(t, "newIP[1]", "", result[0].NewIP)
}
func Test_DecodeTransformTable_NewIP(t *testing.T) {
result, err := DecodeTransformTable("1.2.3.4 ~ 2.3.4.5 ~ ~ 3.4.5.6 ")
@ -76,9 +76,9 @@ func Test_DecodeTransformTable_NewIP(t *testing.T) {
if len(result) != 1 {
t.Errorf("Test %v: expected col length (%v), got (%v)\n", 1, 1, len(result))
}
test_ip(t, "low", "1.2.3.4", result[0].Low)
test_ip(t, "high", "2.3.4.5", result[0].High)
test_ip(t, "newIP", "3.4.5.6", result[0].NewIPs[0])
testIP(t, "low", "1.2.3.4", result[0].Low)
testIP(t, "high", "2.3.4.5", result[0].High)
testIP(t, "newIP", "3.4.5.6", result[0].NewIPs[0])
}
func Test_DecodeTransformTable_order(t *testing.T) {
@ -126,7 +126,7 @@ func Test_TransformIP(t *testing.T) {
High: net.ParseIP("55.255.0.0"),
NewBases: []net.IP{net.ParseIP("66.0.0.0"), net.ParseIP("77.0.0.0")},
}}
//NO TRANSFORMS ON 99.x.x.x PLZ
// NO TRANSFORMS ON 99.x.x.x PLZ
var tests = []struct {
experiment string