Allow to change tests order.

go-gophers · Jan 13, 2017 · 2505c51 · 2505c51
1 parent 34bdb29
commit 2505c51
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/examples/gophers/placehold/main-load.go b/examples/gophers/placehold/main-load.go
@@ -39,5 +39,5 @@ func main() {
 		panic(err)
 	}
 
-	exitCode = r.Load(nil, l, runner.FailStep)
+	exitCode = r.Load(nil, 0, l, runner.FailStep)
 }
diff --git a/examples/gophers/placehold/main-test.go b/examples/gophers/placehold/main-test.go
@@ -33,5 +33,5 @@ func main() {
 	r := runner.New("", log.New(os.Stderr, "", 0))
 	r.Add("TestBasic", placehold.TestBasic, 1)
 
-	exitCode = r.Test(nil)
+	exitCode = r.Test(nil, 0)
 }
diff --git a/gophers/cmd/import.go b/gophers/cmd/import.go
@@ -64,14 +64,14 @@ func main() {
 {{- end }}
 
 {{ if not .Load }}
-    exitCode = r.Test(nil)
+    exitCode = r.Test(nil, 0)
 {{ else }}
     l, err := runner.NewStepLoader(5, 10, 1, 1 * time.Second)
     if err != nil {
         panic(err)
     }
 
-	exitCode = r.Load(nil, l, runner.FailStep)
+	exitCode = r.Load(nil, 0, l, runner.FailStep)
 {{ end -}}
 }
 `))

diff --git a/gophers/runner/runner.go b/gophers/runner/runner.go
@@ -146,10 +146,24 @@ func run(test TestFunc, l *log.Logger) state {
 	return <-result
 }
 
-// Test runs tests matching regexp in random order.
-func (r *Runner) Test(re *regexp.Regexp) int {
+func shuffle(n int, seed int64) []int {
+	if seed == 0 {
+		res := make([]int, n)
+		for i := 0; i < n; i++ {
+			res[i] = i
+		}
+		return res
+	}
+
+	return rand.New(rand.NewSource(seed)).Perm(n)
+}
+
+// Test runs tests matching regexp in order defined by seed.
+// If seed is 0, tests are run sequentially.
+// Otherwise, seed defines random order of tests.
+func (r *Runner) Test(re *regexp.Regexp, seed int64) int {
 	var failedTests, skippedTests []string
-	for _, p := range rand.Perm(len(r.tests)) {
+	for _, p := range shuffle(len(r.tests), seed) {
 		test := r.tests[p]
 		if re != nil && !re.MatchString(test.name) {
 			continue
@@ -273,11 +287,13 @@ func (r *Runner) load(test *addedTest, loader Loader, failMode FailMode) (worstO
 	}
 }
 
-// Load runs tests matching regexp in random order in load test mode.
-func (r *Runner) Load(re *regexp.Regexp, loader Loader, failMode FailMode) int {
+// Test runs tests matching regexp in order defined by seed in load test mode.
+// If seed is 0, tests are run sequentially.
+// Otherwise, seed defines random order of tests.
+func (r *Runner) Load(re *regexp.Regexp, seed int64, loader Loader, failMode FailMode) int {
 	reporter := newReporter(r.l)
 	var failedTests, skippedTests []string
-	for _, p := range rand.Perm(len(r.tests)) {
+	for _, p := range shuffle(len(r.tests), seed) {
 		test := r.tests[p]
 		if re != nil && !re.MatchString(test.name) {
 			continue