From b3bbe1046548ebcaf36706b5365d89c6141fdc99 Mon Sep 17 00:00:00 2001
From: Piotr Tabor <ptab@google.com>
Date: Sat, 26 Sep 2020 15:25:15 +0200
Subject: [PATCH] go.sum: Update & make sure PASSES="mod_tidy" ./test detects
 such problems.

Commit inspired by this failure:
  https://travis-ci.com/github/etcd-io/etcd/jobs/391164537

This is not happanning locally - but can be forced by removal of go.sum
file. Let's watch how frequently we will need to refresh go.sum.
---
 go.sum | 1 -
 test   | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/go.sum b/go.sum
index fbbfa0ede..7028b6bd9 100644
--- a/go.sum
+++ b/go.sum
@@ -183,7 +183,6 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200918174421-af09f7315aff h1:1CPUrky56AcgSpxz/KfgzQWzfG09u5YOL8MvPYBlrL8=
 golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/test b/test
index 7092a48d3..b5e1675b2 100755
--- a/test
+++ b/test
@@ -547,6 +547,10 @@ function mod_tidy_pass {
   tmpModDir=$(mktemp -d --suffix "etcd-mod")
   cp "./go.mod" "./go.sum" "${tmpModDir}"
 
+  # Guarantees keeping go.sum minimal
+  # If this is causing too much problems, we should
+  # stop controlling go.sum at all.
+  rm go.sum
   go mod tidy
 
   set +e