ralsina/tartrazine
1
0
Fork 0
mirror of https://github.com/ralsina/tartrazine.git synced 2025-05-23 16:40:08 -03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix review suggestions

Browse Source 
Signed-off-by: Vadim Markovtsev <vadim@sourced.tech>
This commit is contained in:
Vadim Markovtsev 2017-10-26 15:37:18 +02:00
parent 250519bb51
commit c97a180da5
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
benchmark_test.go
View File

@ -23,6 +23,7 @@ var (
overcomeLanguages []string overcomeLanguages []string
samples []*sample samples []*sample
samplesDir string samplesDir string
cloned bool
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {
@ -35,7 +36,9 @@ func TestMain(m *testing.M) {
if err := cloneLinguist(linguistURL); err != nil { if err := cloneLinguist(linguistURL); err != nil {
log.Fatal(err) log.Fatal(err)
} }
defer os.RemoveAll(filepath.Dir(samplesDir)) if cloned {
defer os.RemoveAll(filepath.Dir(samplesDir))
}
var err error var err error
samples, err = getSamples(samplesDir) samples, err = getSamples(samplesDir)
@ -47,16 +50,23 @@ func TestMain(m *testing.M) {
} }
func cloneLinguist(linguistURL string) error { func cloneLinguist(linguistURL string) error {
repoLinguist, err := ioutil.TempDir("", "linguist-") repoLinguist := os.Getenv(linguistClonedEnvVar)
if err != nil { cloned = repoLinguist == ""
return err if cloned {
var err error
repoLinguist, err = ioutil.TempDir("", "linguist-")
if err != nil {
return err
}
} }
samplesDir = filepath.Join(repoLinguist, "samples") samplesDir = filepath.Join(repoLinguist, "samples")
cmd := exec.Command("git", "clone", linguistURL, repoLinguist) if cloned {
if err := cmd.Run(); err != nil { cmd := exec.Command("git", "clone", linguistURL, repoLinguist)
return err if err := cmd.Run(); err != nil {
return err
}
} }
cwd, err := os.Getwd() cwd, err := os.Getwd()
@ -68,7 +78,7 @@ func cloneLinguist(linguistURL string) error {
return err return err
} }
cmd = exec.Command("git", "checkout", data.LinguistCommit) cmd := exec.Command("git", "checkout", data.LinguistCommit)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
return err return err
} }

5
common_test.go
View File

@ -15,6 +15,7 @@ import (
) )
const linguistURL = "https://github.com/github/linguist.git" const linguistURL = "https://github.com/github/linguist.git"
const linguistClonedEnvVar = "ENRY_TEST_REPO"
type EnryTestSuite struct { type EnryTestSuite struct {
suite.Suite suite.Suite
@ -29,8 +30,8 @@ func TestEnryTestSuite(t *testing.T) {
func (s *EnryTestSuite) SetupSuite() { func (s *EnryTestSuite) SetupSuite() {
var err error var err error
s.repoLinguist = os.Getenv("ENRY_TEST_REPO") s.repoLinguist = os.Getenv(linguistClonedEnvVar)
s.cloned = len(s.repoLinguist) == 0 s.cloned = s.repoLinguist == ""
if s.cloned { if s.cloned {
s.repoLinguist, err = ioutil.TempDir("", "linguist-") s.repoLinguist, err = ioutil.TempDir("", "linguist-")
assert.NoError(s.T(), err) assert.NoError(s.T(), err)

7
internal/code-generator/generator/generator_test.go
View File

@ -13,7 +13,8 @@ import (
) )
const ( const (
linguistURL = "https://github.com/github/linguist.git" linguistURL = "https://github.com/github/linguist.git"
linguistClonedEnvVar = "ENRY_TEST_REPO"
commit = "d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68" commit = "d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68"
samplesDir = "samples" samplesDir = "samples"
languagesFile = "lib/linguist/languages.yml" languagesFile = "lib/linguist/languages.yml"
@ -89,8 +90,8 @@ func TestGeneratorTestSuite(t *testing.T) {
func (s *GeneratorTestSuite) SetupSuite() { func (s *GeneratorTestSuite) SetupSuite() {
var err error var err error
s.tmpLinguist = os.Getenv("ENRY_TEST_REPO") s.tmpLinguist = os.Getenv(linguistClonedEnvVar)
s.cloned = len(s.tmpLinguist) == 0 s.cloned = s.tmpLinguist == ""
if s.cloned { if s.cloned {
s.tmpLinguist, err = ioutil.TempDir("", "linguist-") s.tmpLinguist, err = ioutil.TempDir("", "linguist-")
assert.NoError(s.T(), err) assert.NoError(s.T(), err)