From 810da91a9e3e4b2a9fe0e8aba21b10ed5cf9db34 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Tue, 19 Nov 2024 10:28:26 -0800 Subject: [PATCH] version: fix earlier test/wording mistakes Updates #14069 Change-Id: I1d2fd8a8ab6591af11bfb83748b94342a8ac718f Signed-off-by: Brad Fitzpatrick --- version/version_checkformat.go | 2 +- version/version_internal_test.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/version/version_checkformat.go b/version/version_checkformat.go index 8a24eda13..05a97d191 100644 --- a/version/version_checkformat.go +++ b/version/version_checkformat.go @@ -9,7 +9,7 @@ import "fmt" func init() { // For official Android builds using the tailscale_go toolchain, - // panic if the builder is screwed up we fail to stamp a valid + // panic if the builder is screwed up and we fail to stamp a valid // version string. if !isValidLongWithTwoRepos(Long()) { panic(fmt.Sprintf("malformed version.Long value %q", Long())) diff --git a/version/version_internal_test.go b/version/version_internal_test.go index ce6bd6270..19aeab442 100644 --- a/version/version_internal_test.go +++ b/version/version_internal_test.go @@ -14,7 +14,6 @@ func TestIsValidLongWithTwoRepos(t *testing.T) { {"1.2.259-t01234abcde-g01234abcde", true}, // big patch version {"1.2.3-t01234abcde", false}, // missing repo {"1.2.3-g01234abcde", false}, // missing repo - {"1.2.3-g01234abcde", false}, // missing repo {"-t01234abcde-g01234abcde", false}, {"1.2.3", false}, {"1.2.3-t01234abcde-g", false},