fix local/short testing

livekit · Sep 24, 2024 · 4573bd2 · 4573bd2
1 parent c5937aa
commit 4573bd2
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 14 deletions.
diff --git a/test/edge.go b/test/edge.go
@@ -120,8 +120,7 @@ func (r *Runner) testEdgeCases(t *testing.T) {
 				custom: r.testEmptyStreamBin,
 			},
 		} {
-			r.run(t, test, test.custom)
-			if r.Short {
+			if !r.run(t, test, test.custom) {
 				return
 			}
 		}

diff --git a/test/file.go b/test/file.go
@@ -205,8 +205,7 @@ func (r *Runner) testFile(t *testing.T) {
 			// 	filename:   "t_{track_type}_{time}.webm",
 			// },
 		} {
-			r.run(t, test, r.runFileTest)
-			if r.Short {
+			if !r.run(t, test, r.runFileTest) {
 				return
 			}
 		}

diff --git a/test/images.go b/test/images.go
@@ -70,8 +70,7 @@ func (r *Runner) testImages(t *testing.T) {
 				},
 			},
 		} {
-			r.run(t, test, r.runImagesTest)
-			if r.Short {
+			if !r.run(t, test, r.runImagesTest) {
 				return
 			}
 		}

diff --git a/test/integration.go b/test/integration.go
@@ -46,9 +46,9 @@ func (r *Runner) RunTests(t *testing.T) {
 
 var testNumber int
 
-func (r *Runner) run(t *testing.T, test *testCase, f func(*testing.T, *testCase)) {
+func (r *Runner) run(t *testing.T, test *testCase, f func(*testing.T, *testCase)) bool {
 	if !r.should(runRequestType[test.requestType]) {
-		return
+		return true
 	}
 
 	switch test.requestType {
@@ -76,6 +76,8 @@ func (r *Runner) run(t *testing.T, test *testCase, f func(*testing.T, *testCase)
 
 		f(t, test)
 	})
+
+	return !r.Short
 }
 
 func (r *Runner) awaitIdle(t *testing.T) {

diff --git a/test/multi.go b/test/multi.go
@@ -105,8 +105,7 @@ func (r *Runner) testMulti(t *testing.T) {
 				multi: true,
 			},
 		} {
-			r.run(t, test, r.runMultiTest)
-			if r.Short {
+			if !r.run(t, test, r.runMultiTest) {
 				return
 			}
 		}

diff --git a/test/segments.go b/test/segments.go
@@ -151,8 +151,7 @@ func (r *Runner) testSegments(t *testing.T) {
 				},
 			},
 		} {
-			r.run(t, test, r.runSegmentsTest)
-			if r.Short {
+			if !r.run(t, test, r.runSegmentsTest) {
 				return
 			}
 		}

diff --git a/test/stream.go b/test/stream.go
@@ -155,8 +155,7 @@ func (r *Runner) testStream(t *testing.T) {
 				},
 			},
 		} {
-			r.run(t, test, r.runStreamTest)
-			if r.Short {
+			if !r.run(t, test, r.runStreamTest) {
 				return
 			}
 		}