From 36d1c4540af3ef058d68092e41af05aa4a8c5eca Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 8 Mar 2018 18:48:26 +0100
Subject: all: fix gometalinter warnings

Fix typos, non-canonical code, remove dead code, etc.
---
 pkg/osutil/fileutil_test.go | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'pkg/osutil')

diff --git a/pkg/osutil/fileutil_test.go b/pkg/osutil/fileutil_test.go
index 4db5c0d83..62e07bc8f 100644
--- a/pkg/osutil/fileutil_test.go
+++ b/pkg/osutil/fileutil_test.go
@@ -4,6 +4,7 @@
 package osutil
 
 import (
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -36,29 +37,31 @@ func TestProcessTempDir(t *testing.T) {
 				}
 			}
 			// Now request a bunch of instances concurrently.
-			done := make(chan bool)
+			done := make(chan error)
 			allDirs := make(map[string]bool)
 			var mu sync.Mutex
 			for p := 0; p < P; p++ {
 				go func() {
-					defer func() {
-						done <- true
-					}()
 					dir, err := ProcessTempDir(tmp)
 					if err != nil {
-						t.Fatalf("failed to create process temp dir")
+						done <- fmt.Errorf("failed to create temp dir: %v", err)
+						return
 					}
 					mu.Lock()
 					present := allDirs[dir]
 					allDirs[dir] = true
 					mu.Unlock()
 					if present {
-						t.Fatalf("duplicate dir %v", dir)
+						done <- fmt.Errorf("duplicate dir %v", dir)
+						return
 					}
+					done <- nil
 				}()
 			}
 			for p := 0; p < P; p++ {
-				<-done
+				if err := <-done; err != nil {
+					t.Error(err)
+				}
 			}
 		}()
 	}
-- 
cgit mrf-deployment