TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-01 00:33:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix cmd/natc-consensus tests

Browse Source
This commit is contained in:
Fran Bull 2025-01-28 14:31:29 -08:00
parent a24e3a5f82
commit 01e90c6565
1 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
cmd/natc-consensus/ippool_test.go
View File

@ -1,10 +1,9 @@
package main package main
import ( import (
"encoding/json"
"fmt"
"net/netip" "net/netip"
"testing" "testing"
"time"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
) )
@ -43,7 +42,10 @@ func TestIPForDomain(t *testing.T) {
v4Ranges: []netip.Prefix{pfx}, v4Ranges: []netip.Prefix{pfx},
dnsAddr: netip.MustParseAddr("100.64.0.0"), dnsAddr: netip.MustParseAddr("100.64.0.0"),
} }
a, err := ipp.applyCheckoutAddr(tailcfg.NodeID(1), "example.com") now := time.Now()
deadline := now.Add(-2 * time.Hour)
a, err := ipp.applyCheckoutAddr(tailcfg.NodeID(1), "example.com", deadline, now)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -51,7 +53,7 @@ func TestIPForDomain(t *testing.T) {
t.Fatalf("expected %v to be in the prefix %v", a, pfx) t.Fatalf("expected %v to be in the prefix %v", a, pfx)
} }
b, err := ipp.applyCheckoutAddr(tailcfg.NodeID(1), "a.example.com") b, err := ipp.applyCheckoutAddr(tailcfg.NodeID(1), "a.example.com", deadline, now)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -62,7 +64,7 @@ func TestIPForDomain(t *testing.T) {
t.Fatalf("same address issued twice %v, %v", a, b) t.Fatalf("same address issued twice %v, %v", a, b)
} }
c, err := ipp.applyCheckoutAddr(tailcfg.NodeID(1), "example.com") c, err := ipp.applyCheckoutAddr(tailcfg.NodeID(1), "example.com", deadline, now)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -80,50 +82,19 @@ func TestDomainForIP(t *testing.T) {
ipp := (*ipPool)(&sm) ipp := (*ipPool)(&sm)
nid := tailcfg.NodeID(1) nid := tailcfg.NodeID(1)
domain := "example.com" domain := "example.com"
d := ipp.DomainForIP(nid, netip.MustParseAddr("100.64.0.1")) now := time.Now()
deadline := now.Add(-2 * time.Hour)
d := ipp.DomainForIP(nid, netip.MustParseAddr("100.64.0.1"), now)
if d != "" { if d != "" {
t.Fatalf("expected an empty string if the addr is not found but got %s", d) t.Fatalf("expected an empty string if the addr is not found but got %s", d)
} }
a, err := sm.applyCheckoutAddr(nid, domain) a, err := sm.applyCheckoutAddr(nid, domain, deadline, now)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
d2 := ipp.DomainForIP(nid, a) d2 := ipp.DomainForIP(nid, a, now)
if d2 != domain { if d2 != domain {
t.Fatalf("expected %s but got %s", domain, d2) t.Fatalf("expected %s but got %s", domain, d2)
} }
} }
func TestBlah(t *testing.T) {
type ecr interface {
getResult() interface{}
setResult(interface{})
toJSON() ([]byte, error)
fromJSON([]byte) err
}
type fran struct {
Result netip.Addr
}
func(f *fran) toJSON() string {
return json.Marshal(f)
}
func(f *fran) fromJSON(bs []byte) err {
return json.UnMarshal(bs, f)
}
thrujson := func(in ecr) ecr {
bs, err := json.Marshal(in)
if err != nil {
t.Fatal(err)
}
var out ecr
err = json.Unmarshal(bs, &out)
if err != nil {
t.Fatal(err)
}
return out
}
a := netip.Addr{}
out := thrujson(ecr{Result: a}).Result
b := (out).(netip.Addr)
fmt.Println(b)
}