From: Michael Matloob <matloob@golang.org>
Date: Thu, 20 Feb 2020 17:53:32 +0000 (-0500)
Subject: cmd/go: in tests, add sync before closing file in copyFile helper
X-Git-Tag: go1.15beta1~1173
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6396bc9df705310c9e7848773154960b7c92978c;p=gostls13.git

cmd/go: in tests, add sync before closing file in copyFile helper

An experiment to see if this helps flakiness go away in
TestExecutableGOROOT.

Updates #37306

Change-Id: I2f4f63bdb507359ca07267d86cdb41fe4968f151
Reviewed-on: https://go-review.googlesource.com/c/go/+/220317
Run-TryBot: Michael Matloob <matloob@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
---

diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
index 9da94360f9..8926482b05 100644
--- a/src/cmd/go/go_test.go
+++ b/src/cmd/go/go_test.go
@@ -2454,11 +2454,15 @@ func copyFile(src, dst string, perm os.FileMode) error {
 	}
 
 	_, err = io.Copy(df, sf)
-	err2 := df.Close()
+	err2 := df.Sync()
+	err3 := df.Close()
 	if err != nil {
 		return err
 	}
-	return err2
+	if err2 != nil {
+		return err2
+	}
+	return err3
 }
 
 // TestExecutableGOROOT verifies that the cmd/go binary itself uses