Skip to content

Commit 59fe14d

Browse files
authored
Merge pull request #120 from harshanarayana/hfx/GIT-119-fix-broken-parallel-mode-v1
GIT-119: handle scoping for parallel tests
2 parents 0173d3a + 2b14f5e commit 59fe14d

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

pkg/env/env.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,18 +243,19 @@ func (e *testEnv) processTests(t *testing.T, enableParallelRun bool, testFeature
243243

244244
var wg sync.WaitGroup
245245
for i, feature := range testFeatures {
246+
featureCopy := feature
246247
featName := feature.Name()
247248
if featName == "" {
248249
featName = fmt.Sprintf("Feature-%d", i+1)
249250
}
250251
if runInParallel {
251252
wg.Add(1)
252-
go func(w *sync.WaitGroup) {
253+
go func(w *sync.WaitGroup, featName string, f types.Feature) {
253254
defer w.Done()
254-
e.processTestFeature(t, featName, feature)
255-
}(&wg)
255+
e.processTestFeature(t, featName, f)
256+
}(&wg, featName, featureCopy)
256257
} else {
257-
e.processTestFeature(t, featName, feature)
258+
e.processTestFeature(t, featName, featureCopy)
258259
}
259260
}
260261
if runInParallel {

support/kind/kind.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/vladimirvivien/gexe"
3030
)
3131

32-
var kindVersion = "v0.11.0"
32+
var kindVersion = "v0.12.0"
3333

3434
type Cluster struct {
3535
name string
@@ -154,7 +154,7 @@ func (k *Cluster) Destroy() error {
154154

155155
func (k *Cluster) findOrInstallKind(e *gexe.Echo) error {
156156
if e.Prog().Avail("kind") == "" {
157-
log.V(4).Infof(`kind not found, installing with GO111MODULE="on" go get sigs.k8s.io/kind@%s`, kindVersion)
157+
log.V(4).Infof(`kind not found, installing with go install sigs.k8s.io/kind@%s`, kindVersion)
158158
if err := k.installKind(e); err != nil {
159159
return err
160160
}
@@ -167,8 +167,8 @@ func (k *Cluster) installKind(e *gexe.Echo) error {
167167
kindVersion = k.version
168168
}
169169

170-
log.V(4).Infof("Installing: go get sigs.k8s.io/kind@%s", kindVersion)
171-
p := e.SetEnv("GO111MODULE", "on").RunProc(fmt.Sprintf("go get sigs.k8s.io/kind@%s", kindVersion))
170+
log.V(4).Infof("Installing: go install sigs.k8s.io/kind@%s", kindVersion)
171+
p := e.RunProc(fmt.Sprintf("go install sigs.k8s.io/kind@%s", kindVersion))
172172
if p.Err() != nil {
173173
return fmt.Errorf("failed to install kind: %s", p.Err())
174174
}

0 commit comments

Comments
 (0)