From 6e6936d73d00cfb0bb6131b1b919807e3d4b1f73 Mon Sep 17 00:00:00 2001
From: Mura Li <typeless@users.noreply.github.com>
Date: Fri, 13 Dec 2019 17:03:38 +0800
Subject: [PATCH] Fix nondeterministic behavior (#9341)
The underlying implementation of os.exec uses channels and goroutines.
It is possible to have time-variant error values returned from Cmd.Wait
depending on which comes first.
Also, the git subcommand and options should be separated tokens.
Fixes a flaky test in modules/git/command_test.go
---
modules/git/command.go | 2 +-
modules/git/command_test.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/git/command.go b/modules/git/command.go
index f01db2e1d8..33143dbd75 100644
--- a/modules/git/command.go
+++ b/modules/git/command.go
@@ -138,7 +138,7 @@ func (c *Command) RunInDirTimeoutEnvFullPipelineFunc(env []string, timeout time.
fn(ctx, cancel)
}
- if err := cmd.Wait(); err != nil {
+ if err := cmd.Wait(); err != nil && ctx.Err() != context.DeadlineExceeded {
return err
}
diff --git a/modules/git/command_test.go b/modules/git/command_test.go
index 2f35b3c329..00801ae31f 100644
--- a/modules/git/command_test.go
+++ b/modules/git/command_test.go
@@ -30,7 +30,7 @@ func TestRunInDirTimeoutPipelineAlwaysTimeout(t *testing.T) {
maxLoops := 1000
// 'git hash-object --stdin' blocks on stdin so we can have the timeout triggered.
- cmd := NewCommand("hash-object --stdin")
+ cmd := NewCommand("hash-object", "--stdin")
for i := 0; i < maxLoops; i++ {
if err := cmd.RunInDirTimeoutPipeline(1*time.Microsecond, "", nil, nil); err != nil {
if err != context.DeadlineExceeded {