From d706c3516dca8f65f837c88288e1e1cb8b668a5f Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Sun, 23 Oct 2022 11:42:15 +0200 Subject: [PATCH] Remove 1.16 from FQDN, bump 1.32.1 Signed-off-by: Kristoffer Dalby --- integration/general_test.go | 7 ++++--- integration/scenario.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/integration/general_test.go b/integration/general_test.go index 183f6615..026a0691 100644 --- a/integration/general_test.go +++ b/integration/general_test.go @@ -84,8 +84,9 @@ func TestPingAllByHostname(t *testing.T) { } spec := map[string]int{ - "namespace3": len(TailscaleVersions), - "namespace4": len(TailscaleVersions), + // Omit 1.16.2 (-1) because it does not have the FQDN field + "namespace3": len(TailscaleVersions) - 1, + "namespace4": len(TailscaleVersions) - 1, } err = scenario.CreateHeadscaleEnv(spec) @@ -113,7 +114,7 @@ func TestPingAllByHostname(t *testing.T) { for _, client := range allClients { fqdn, err := client.FQDN() if err != nil { - t.Errorf("failed to get fqdn of client %s: %s", t.Name(), err) + t.Errorf("failed to get fqdn of client %s: %s", client.Hostname, err) } allHostnames = append(allHostnames, fqdn) diff --git a/integration/scenario.go b/integration/scenario.go index 4676fe4e..d391be46 100644 --- a/integration/scenario.go +++ b/integration/scenario.go @@ -29,7 +29,7 @@ var ( TailscaleVersions = []string{ "head", "unstable", - "1.32.0", + "1.32.1", "1.30.2", "1.28.0", "1.26.2",