Fixup after ts interface

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2022-10-23 11:55:37 +02:00
parent d706c3516d
commit 53b4bb220d
No known key found for this signature in database
2 changed files with 4 additions and 3 deletions

View File

@ -94,7 +94,7 @@ func TestPingAllByHostname(t *testing.T) {
t.Errorf("failed to create headscale environment: %s", err) t.Errorf("failed to create headscale environment: %s", err)
} }
var allClients []*tsic.TailscaleInContainer var allClients []TailscaleClient
var allHostnames []string var allHostnames []string
for namespace := range spec { for namespace := range spec {
@ -114,7 +114,7 @@ func TestPingAllByHostname(t *testing.T) {
for _, client := range allClients { for _, client := range allClients {
fqdn, err := client.FQDN() fqdn, err := client.FQDN()
if err != nil { if err != nil {
t.Errorf("failed to get fqdn of client %s: %s", client.Hostname, err) t.Errorf("failed to get fqdn of client %s: %s", client.Hostname(), err)
} }
allHostnames = append(allHostnames, fqdn) allHostnames = append(allHostnames, fqdn)
@ -126,7 +126,7 @@ func TestPingAllByHostname(t *testing.T) {
for _, hostname := range allHostnames { for _, hostname := range allHostnames {
err := client.Ping(hostname) err := client.Ping(hostname)
if err != nil { if err != nil {
t.Errorf("failed to ping %s from %s: %s", hostname, client.Hostname, err) t.Errorf("failed to ping %s from %s: %s", hostname, client.Hostname(), err)
} else { } else {
success++ success++
} }

View File

@ -12,6 +12,7 @@ type TailscaleClient interface {
Version() string Version() string
Up(loginServer, authKey string) error Up(loginServer, authKey string) error
IPs() ([]netip.Addr, error) IPs() ([]netip.Addr, error)
FQDN() (string, error)
Status() (*ipnstate.Status, error) Status() (*ipnstate.Status, error)
WaitForPeers(expected int) error WaitForPeers(expected int) error
Ping(hostnameOrIP string) error Ping(hostnameOrIP string) error