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

Don't count diff2.REPORT (informational warnings) as a "correction" (#2361)

Browse Source 
Co-authored-by: Tom Limoncelli <tal@whatexit.org>
This commit is contained in:
Tom Limoncelli
2023-05-16 10:42:08 -04:00
committed by GitHub
parent 84e39b4ae2
commit 66a76c44c1
10 changed files with 90 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
integrationTest/integration_test.go
View File

@@ -223,12 +223,12 @@ func makeChanges(t *testing.T, prv providers.DNSServiceProvider, dc *models.Doma
}
// get and run corrections for first time
corrections, err := zonerecs.CorrectZoneRecords(prv, dom)
_, corrections, err := zonerecs.CorrectZoneRecords(prv, dom)
if err != nil {
t.Fatal(fmt.Errorf("runTests: %w", err))
}
if tst.Changeless {
if count := zonerecs.CountActionable(corrections); count != 0 {
if count := len(corrections); count != 0 {
t.Logf("Expected 0 corrections on FIRST run, but found %d.", count)
for i, c := range corrections {
t.Logf("UNEXPECTED #%d: %s", i, c.Msg)
@@ -256,11 +256,11 @@ func makeChanges(t *testing.T, prv providers.DNSServiceProvider, dc *models.Doma
}
// run a second time and expect zero corrections
corrections, err = zonerecs.CorrectZoneRecords(prv, dom2)
_, corrections, err = zonerecs.CorrectZoneRecords(prv, dom2)
if err != nil {
t.Fatal(err)
}
if count := zonerecs.CountActionable(corrections); count != 0 {
if count := len(corrections); count != 0 {
t.Logf("Expected 0 corrections on second run, but found %d.", count)
for i, c := range corrections {
t.Logf("UNEXPECTED #%d: %s", i, c.Msg)
@@ -351,10 +351,13 @@ func TestDualProviders(t *testing.T) {
run := func() {
dom, _ := dc.Copy()
cs, err := zonerecs.CorrectZoneRecords(p, dom)
rs, cs, err := zonerecs.CorrectZoneRecords(p, dom)
if err != nil {
t.Fatal(err)
}
for i, c := range rs {
t.Logf("INFO#%d:\n%s", i+1, c.Msg)
}
for i, c := range cs {
t.Logf("#%d:\n%s", i+1, c.Msg)
if err = c.F(); err != nil {
@@ -373,14 +376,17 @@ func TestDualProviders(t *testing.T) {
run()
// run again to make sure no corrections
t.Log("Running again to ensure stability")
cs, err := zonerecs.CorrectZoneRecords(p, dc)
rs, cs, err := zonerecs.CorrectZoneRecords(p, dc)
if err != nil {
t.Fatal(err)
}
if count := zonerecs.CountActionable(cs); count != 0 {
if count := len(cs); count != 0 {
t.Logf("Expect no corrections on second run, but found %d.", count)
for i, c := range rs {
t.Logf("INFO#%d:\n%s", i+1, c.Msg)
}
for i, c := range cs {
t.Logf("#%d: %s", i, c.Msg)
t.Logf("#%d: %s", i+1, c.Msg)
}
t.FailNow()
}