chore: Fix addresspool tests

Author: driskell

lc-lib/addresspool/pool_test.go

@@ -33,7 +33,7 @@ func TestGeneratePoolSrv(t *testing.T) {
 		t.Fatalf("Address pool item host unexpected: %s", pool[0].HostPort)
 	} else if pool[0].Server != "@_test._tcp.test.woods.dev" {
 		t.Fatalf("Address pool item server unexpected: %s", pool[0].Server)
-	} else if pool[0].Desc != "host.test.woods.dev:1234 - @_test._tcp.test.woods.dev" {
+	} else if pool[0].Desc != "@_test._tcp.test.woods.dev" {
 		t.Fatalf("Address pool item desc unexpected: %s", pool[0].Desc)
 	}
 }
@@ -50,7 +50,7 @@ func TestPoolSrvRfc(t *testing.T) {
 		t.Fatalf("Address pool item host unexpected: %s", pool[0].HostPort)
 	} else if pool[0].Server != "@test.woods.dev" {
 		t.Fatalf("Address pool item server unexpected: %s", pool[0].Server)
-	} else if pool[0].Desc != "host.test.woods.dev:1234 - @test.woods.dev" {
+	} else if pool[0].Desc != "@test.woods.dev" {
 		t.Fatalf("Address pool item desc unexpected: %s", pool[0].Desc)
 	}
 }
@@ -67,13 +67,13 @@ func TestPoolSrvRfcMultiple(t *testing.T) {
 		t.Fatalf("Address pool item host unexpected: %s", pool[0].HostPort)
 	} else if pool[0].Server != "@multitest.woods.dev" {
 		t.Fatalf("Address pool item server unexpected: %s", pool[0].Server)
-	} else if pool[0].Desc != "host.test.woods.dev:1234 - @multitest.woods.dev" {
+	} else if pool[0].Desc != "@multitest.woods.dev" {
 		t.Fatalf("Address pool item desc unexpected: %s", pool[0].Desc)
 	} else if pool[1].HostPort != "multihost.test.woods.dev:1235" {
 		t.Fatalf("Address pool item host unexpected: %s", pool[1].HostPort)
 	} else if pool[1].Server != "@multitest.woods.dev" {
 		t.Fatalf("Address pool item server unexpected: %s", pool[1].Server)
-	} else if pool[1].Desc != "multihost.test.woods.dev:1235 - @multitest.woods.dev" {
+	} else if pool[1].Desc != "@multitest.woods.dev" {
 		t.Fatalf("Address pool item desc unexpected: %s", pool[1].Desc)
 	}
 }

lc-lib/addresspool/poolentry_test.go

@@ -71,12 +71,12 @@ func TestPoolEntryHost(t *testing.T) {
 		secondAddr = tmp
 	}
 
-	if addr.Desc() != "8.8.8.8:555 - desc" {
+	if addr.Desc() != "8.8.8.8:555 (desc)" {
 		t.Errorf("Address pool did not return correct desc: %s", addr.Desc())
 	} else if addr.Addr().String() != "8.8.8.8:555" {
 		t.Errorf("Address pool did not return correct addr: %s", addr.Addr().String())
 	}
-	if secondAddr.Desc() != "[2001:4860:4860::8888]:555 - desc" {
+	if secondAddr.Desc() != "[2001:4860:4860::8888]:555 (desc)" {
 		t.Errorf("Address pool did not return correct desc: %s", secondAddr.Desc())
 	} else if secondAddr.Addr().String() != "[2001:4860:4860::8888]:555" {
 		t.Errorf("Address pool did not return correct addr: %s", secondAddr.Addr().String())
@@ -184,23 +184,23 @@ func TestHostLooping(t *testing.T) {
 		t.Fatalf("Address pool did not parse IP correctly: %s", err)
 	} else if addr == nil {
 		t.Fatal("Address pool returned nil addr")
-	} else if addr.Desc() != "8.8.8.8:1234 - desc" {
+	} else if addr.Desc() != "8.8.8.8:1234 (desc)" {
 		t.Errorf("Address pool returned incorrect desc: %s", addr.Desc())
 	}
 	addr, err = poolEntry.Next()
 	if err != nil {
 		t.Fatalf("Address pool did not parse IP correctly: %s", err)
 	} else if addr == nil {
 		t.Fatal("Address pool returned nil addr")
-	} else if addr.Desc() != "[2001:4860:4860::8888]:1234 - desc" {
+	} else if addr.Desc() != "[2001:4860:4860::8888]:1234 (desc)" {
 		t.Errorf("Address pool returned incorrect desc: %s", addr.Desc())
 	}
 	addr, err = poolEntry.Next()
 	if err != nil {
 		t.Fatalf("Address pool did not parse IP correctly: %s", err)
 	} else if addr == nil {
 		t.Fatal("Address pool returned nil addr")
-	} else if addr.Desc() != "8.8.8.8:1234 - desc" {
+	} else if addr.Desc() != "8.8.8.8:1234 (desc)" {
 		t.Errorf("Address pool returned incorrect desc: %s", addr.Desc())
 	}
 }
@@ -219,7 +219,7 @@ func TestHostLoopingRefresh(t *testing.T) {
 		t.Fatalf("Address pool did not parse IP correctly: %s", err)
 	} else if addr == nil {
 		t.Fatal("Address pool returned nil addr")
-	} else if addr.Desc() != "8.8.8.8:1234 - desc" {
+	} else if addr.Desc() != "8.8.8.8:1234 (desc)" {
 		t.Errorf("Address pool returned incorrect desc: %s", addr.Desc())
 	}
 
@@ -245,10 +245,10 @@ func TestHostLoopingRefresh(t *testing.T) {
 		secondAddr = tmp
 	}
 
-	if addr.Desc() != "8.8.8.8:1234 - desc" {
+	if addr.Desc() != "8.8.8.8:1234 (desc)" {
 		t.Errorf("Address pool returned incorrect desc: %s", addr.Desc())
 	}
-	if secondAddr.Desc() != "[2001:4860:4860::8888]:1234 - desc" {
+	if secondAddr.Desc() != "[2001:4860:4860::8888]:1234 (desc)" {
 		t.Errorf("Address pool returned incorrect desc: %s", addr.Desc())
 	}
 }