fix Test_RuntimeWithSkip, some renaming and rearranging

Author: dylanhitt

pkg/output/cli.go

@@ -57,7 +57,7 @@ func (w *OutputWriter) GetEventHandler() *runtime.EventHandler {
 
 	handler.TestSkipped = func(testResult runtime.TestResult) {
 		tr := convertTestResult(testResult)
-		w.printSkipped(tr)
+		w.printSkip(tr)
 	}
 
 	return &handler
@@ -90,7 +90,7 @@ func (w *OutputWriter) printResult(r TestResult) {
 	w.fprintf(w.template.testResult(r))
 }
 
-func (w *OutputWriter) printSkipped(r TestResult) {
+func (w *OutputWriter) printSkip(r TestResult) {
 	w.fprintf(fmt.Sprintf("- [skipped] %s: was skipped", r.Title))
 }
 

pkg/runtime/runner.go

@@ -12,23 +12,16 @@ type Runner struct {
 	Nodes []Node
 }
 
-// Execute the runner
-func (r *Runner) Execute(tests []TestCase) <-chan TestResult {
+// Run the runner
+func (r *Runner) Run(tests []TestCase) <-chan TestResult {
 	in := make(chan TestCase)
 	out := make(chan TestResult)
 
 	go func(tests []TestCase) {
 		defer close(in)
-
 		for _, t := range tests {
-			if t.Disable {
-				tr := TestResult{TestCase: t, Skipped: true}
-				out <- tr
-				continue
-			}
 			in <- t
 		}
-
 	}(tests)
 
 	var wg sync.WaitGroup
@@ -38,6 +31,13 @@ func (r *Runner) Execute(tests []TestCase) <-chan TestResult {
 		defer wg.Done()
 
 		for t := range tests {
+			// If test is disabled skip it
+			if t.Disable {
+				tr := TestResult{TestCase: t, Skipped: true}
+				out <- tr
+				continue
+			}
+
 			// If no node was set use local mode as default
 			if len(t.Nodes) == 0 {
 				t.Nodes = []string{"local"}
@@ -60,7 +60,6 @@ func (r *Runner) Execute(tests []TestCase) <-chan TestResult {
 				}
 				out <- result
 			}
-
 		}
 	}(in)
 

pkg/runtime/runner_test.go

@@ -12,7 +12,7 @@ func Test_RunnerExexcute(t *testing.T) {
 		Nodes: getExampleNodes(),
 	}
 
-	got := r.Execute(s)
+	got := r.Run(s)
 
 	assert.IsType(t, make(<-chan TestResult), got)
 

pkg/runtime/runtime.go

@@ -131,10 +131,11 @@ type Result struct {
 // Start starts the given test suite and executes all tests
 func (r *Runtime) Start(tests []TestCase) Result {
 	result := Result{}
-	testCh := r.Runner.Execute(tests)
+	testCh := r.Runner.Run(tests)
 	start := time.Now()
 	for tr := range testCh {
 		if tr.Skipped {
+			result.Skipped++
 			r.EventHandler.TestSkipped(tr)
 			result.TestResults = append(result.TestResults, tr)
 			continue

pkg/runtime/runtime_test.go

@@ -84,6 +84,9 @@ func getRuntime() Runtime {
 		TestFinished: func(tr TestResult) {
 			fmt.Println("I do nothing")
 		},
+		TestSkipped: func(tr TestResult) {
+			fmt.Printf("%s was skipped", tr.TestCase.Title)
+		},
 	}
 
 	runtime := NewRuntime(&eh, Node{Name: "test"}, Node{Name: "test2"})