From c97a180da5f7c55269f84dbc907805040ba8dc0e Mon Sep 17 00:00:00 2001
From: Vadim Markovtsev <vadim@sourced.tech>
Date: Thu, 26 Oct 2017 15:37:18 +0200
Subject: [PATCH] Fix review suggestions

Signed-off-by: Vadim Markovtsev <vadim@sourced.tech>
---
 benchmark_test.go                             | 26 +++++++++++++------
 common_test.go                                |  5 ++--
 .../generator/generator_test.go               |  7 ++---
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/benchmark_test.go b/benchmark_test.go
index 9ad8289..ca42191 100644
--- a/benchmark_test.go
+++ b/benchmark_test.go
@@ -23,6 +23,7 @@ var (
 	overcomeLanguages []string
 	samples           []*sample
 	samplesDir        string
+	cloned            bool
 )
 
 func TestMain(m *testing.M) {
@@ -35,7 +36,9 @@ func TestMain(m *testing.M) {
 	if err := cloneLinguist(linguistURL); err != nil {
 		log.Fatal(err)
 	}
-	defer os.RemoveAll(filepath.Dir(samplesDir))
+	if cloned {
+		defer os.RemoveAll(filepath.Dir(samplesDir))
+	}
 
 	var err error
 	samples, err = getSamples(samplesDir)
@@ -47,16 +50,23 @@ func TestMain(m *testing.M) {
 }
 
 func cloneLinguist(linguistURL string) error {
-	repoLinguist, err := ioutil.TempDir("", "linguist-")
-	if err != nil {
-		return err
+	repoLinguist := os.Getenv(linguistClonedEnvVar)
+	cloned = repoLinguist == ""
+	if cloned {
+		var err error
+		repoLinguist, err = ioutil.TempDir("", "linguist-")
+		if err != nil {
+			return err
+		}
 	}
 
 	samplesDir = filepath.Join(repoLinguist, "samples")
 
-	cmd := exec.Command("git", "clone", linguistURL, repoLinguist)
-	if err := cmd.Run(); err != nil {
-		return err
+	if cloned {
+		cmd := exec.Command("git", "clone", linguistURL, repoLinguist)
+		if err := cmd.Run(); err != nil {
+			return err
+		}
 	}
 
 	cwd, err := os.Getwd()
@@ -68,7 +78,7 @@ func cloneLinguist(linguistURL string) error {
 		return err
 	}
 
-	cmd = exec.Command("git", "checkout", data.LinguistCommit)
+	cmd := exec.Command("git", "checkout", data.LinguistCommit)
 	if err := cmd.Run(); err != nil {
 		return err
 	}
diff --git a/common_test.go b/common_test.go
index 019e743..de332de 100644
--- a/common_test.go
+++ b/common_test.go
@@ -15,6 +15,7 @@ import (
 )
 
 const linguistURL = "https://github.com/github/linguist.git"
+const linguistClonedEnvVar = "ENRY_TEST_REPO"
 
 type EnryTestSuite struct {
 	suite.Suite
@@ -29,8 +30,8 @@ func TestEnryTestSuite(t *testing.T) {
 
 func (s *EnryTestSuite) SetupSuite() {
 	var err error
-	s.repoLinguist = os.Getenv("ENRY_TEST_REPO")
-	s.cloned = len(s.repoLinguist) == 0
+	s.repoLinguist = os.Getenv(linguistClonedEnvVar)
+	s.cloned = s.repoLinguist == ""
 	if s.cloned {
 		s.repoLinguist, err = ioutil.TempDir("", "linguist-")
 		assert.NoError(s.T(), err)
diff --git a/internal/code-generator/generator/generator_test.go b/internal/code-generator/generator/generator_test.go
index 9177731..07ba0df 100644
--- a/internal/code-generator/generator/generator_test.go
+++ b/internal/code-generator/generator/generator_test.go
@@ -13,7 +13,8 @@ import (
 )
 
 const (
-	linguistURL    = "https://github.com/github/linguist.git"
+	linguistURL = "https://github.com/github/linguist.git"
+	linguistClonedEnvVar = "ENRY_TEST_REPO"
 	commit        = "d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68"
 	samplesDir    = "samples"
 	languagesFile = "lib/linguist/languages.yml"
@@ -89,8 +90,8 @@ func TestGeneratorTestSuite(t *testing.T) {
 
 func (s *GeneratorTestSuite) SetupSuite() {
 	var err error
-	s.tmpLinguist = os.Getenv("ENRY_TEST_REPO")
-	s.cloned = len(s.tmpLinguist) == 0
+	s.tmpLinguist = os.Getenv(linguistClonedEnvVar)
+	s.cloned = s.tmpLinguist == ""
 	if s.cloned {
 		s.tmpLinguist, err = ioutil.TempDir("", "linguist-")
 		assert.NoError(s.T(), err)