mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

fix tests

Browse Source
This commit is contained in:
Tom Limoncelli
2023-11-18 15:03:38 -05:00
parent b522d116f5
commit e1abebdf2c
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
commands/getZones.go
View File

@ -286,8 +286,15 @@ func GetZone(args GetZoneArgs) error {
} }
} }
var targ string
if rec.Type == "TXT" {
targ = rec.GetTargetTXTJoined()
} else {
targ = rec.GetTargetCombined()
}
fmt.Fprintf(w, "%s\t%s\t%d\tIN\t%s\t%s%s\n", fmt.Fprintf(w, "%s\t%s\t%d\tIN\t%s\t%s%s\n",
rec.NameFQDN, rec.Name, rec.TTL, rec.Type, rec.GetTargetCombined(), cfproxy) rec.NameFQDN, rec.Name, rec.TTL, rec.Type, targ, cfproxy)
} }
default: default:

6
pkg/diff2/analyze_test.go
View File

@ -313,7 +313,7 @@ ChangeList: len=3
ChangeList: len=8 ChangeList: len=8
00: Change: verb=CREATE 00: Change: verb=CREATE
key={labf.f.com TXT} key={labf.f.com TXT}
new=[foo] new=["foo"]
msg=["+ CREATE labf.f.com TXT \"foo\" ttl=300"] msg=["+ CREATE labf.f.com TXT \"foo\" ttl=300"]
01: Change: verb=CHANGE 01: Change: verb=CHANGE
key={labg.f.com NS} key={labg.f.com NS}
@ -365,7 +365,7 @@ ChangeList: len=8
ChangeList: len=6 ChangeList: len=6
00: Change: verb=CREATE 00: Change: verb=CREATE
key={labf.f.com } key={labf.f.com }
new=[foo] new=["foo"]
msg=["+ CREATE labf.f.com TXT \"foo\" ttl=300"] msg=["+ CREATE labf.f.com TXT \"foo\" ttl=300"]
01: Change: verb=CHANGE 01: Change: verb=CHANGE
key={labg.f.com } key={labg.f.com }
@ -429,7 +429,7 @@ ChangeList: len=11
msg=["± MODIFY labe.f.com A (10.10.10.18 ttl=300) -> (10.10.10.98 ttl=300)"] msg=["± MODIFY labe.f.com A (10.10.10.18 ttl=300) -> (10.10.10.98 ttl=300)"]
04: Change: verb=CREATE 04: Change: verb=CREATE
key={labf.f.com TXT} key={labf.f.com TXT}
new=[foo] new=["foo"]
msg=["+ CREATE labf.f.com TXT \"foo\" ttl=300"] msg=["+ CREATE labf.f.com TXT \"foo\" ttl=300"]
05: Change: verb=CHANGE 05: Change: verb=CHANGE
key={labg.f.com NS} key={labg.f.com NS}

2
pkg/diff2/compareconfig_test.go
View File

@ -187,7 +187,7 @@ ldata:
labelMap: len=6 map[laba.f.com:true labc.f.com:true labe.f.com:true labf.f.com:true labg.f.com:true labh.f.com:true] labelMap: len=6 map[laba.f.com:true labc.f.com:true labe.f.com:true labf.f.com:true labg.f.com:true labh.f.com:true]
keyMap: len=8 map[{laba.f.com A}:true {laba.f.com MX}:true {labc.f.com CNAME}:true {labe.f.com A}:true {labf.f.com TXT}:true {labg.f.com NS}:true {labh.f.com A}:true {labh.f.com CNAME}:true] keyMap: len=8 map[{laba.f.com A}:true {laba.f.com MX}:true {labc.f.com CNAME}:true {labe.f.com A}:true {labf.f.com TXT}:true {labg.f.com NS}:true {labh.f.com A}:true {labh.f.com CNAME}:true]
existing: ["1.2.3.4" "10 laba.f.com." "laba.f.com." "10.10.10.15" "10.10.10.16" "10.10.10.17" "10.10.10.18" "laba.f.com." "labb.f.com." "labc.f.com." "labe.f.com." "labd.f.com."] existing: ["1.2.3.4" "10 laba.f.com." "laba.f.com." "10.10.10.15" "10.10.10.16" "10.10.10.17" "10.10.10.18" "laba.f.com." "labb.f.com." "labc.f.com." "labe.f.com." "labd.f.com."]
desired: ["1.2.3.4" "1.2.3.5" "20 labb.f.com." "10.10.10.95" "10.10.10.96" "10.10.10.97" "10.10.10.98" "foo" "labf.f.com." "laba.f.com." "labe.f.com." "labb.f.com." "1.2.3.4"] desired: ["1.2.3.4" "1.2.3.5" "20 labb.f.com." "10.10.10.95" "10.10.10.96" "10.10.10.97" "10.10.10.98" "\"foo\"" "labf.f.com." "laba.f.com." "labe.f.com." "labb.f.com." "1.2.3.4"]
origin: f.com origin: f.com
compFn: <nil> compFn: <nil>
`, `,

6
pkg/js/parse_tests/017-txt/foo.com.zone.ACTUAL
View File

@ -1,6 +0,0 @@
$TTL 300
a IN TXT "simple"
b IN TXT "ws at end "
c IN TXT "one"
d IN TXT "bonieclyde"
e IN TXT "strawwoodbrick"