zip: always populate known keys in haveVCS map in TestVCS
This fixes TestVCS after CL 375915 on longtest builders that lack
'git' binaries.
Change-Id: Ifb8a547e411c8e0ac6736e8a439107df87f41c91
Reviewed-on: https://go-review.googlesource.com/c/mod/+/375936
Trust: Bryan Mills <bcmills@google.com>
Run-TryBot: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/zip/zip_test.go b/zip/zip_test.go
index f5243ad..adcba9b 100644
--- a/zip/zip_test.go
+++ b/zip/zip_test.go
@@ -1037,12 +1037,11 @@
var downloadErrorCount int32
const downloadErrorLimit = 3
- haveVCS := make(map[string]bool)
- if _, err := gitPath(); err == nil {
- haveVCS["git"] = true
- }
- if _, err := exec.LookPath("hg"); err == nil {
- haveVCS["hg"] = true
+ _, gitErr := gitPath()
+ _, hgErr := exec.LookPath("hg")
+ haveVCS := map[string]bool{
+ "git": gitErr == nil,
+ "hg": hgErr == nil,
}
for _, test := range []struct {
