diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ebc07e0b..dae674020 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -197,7 +197,9 @@ jobs: - name: Run SRS blackbox-test run: | docker run --rm -w /srs/trunk/3rdparty/srs-bench srs:test \ - ./objs/srs_blackbox_test -test.v -test.parallel 64 + ./objs/srs_blackbox_test -test.v -test.run '^TestFast' -test.parallel 64 + docker run --rm -w /srs/trunk/3rdparty/srs-bench srs:test \ + ./objs/srs_blackbox_test -test.v -test.run '^TestSlow' -test.parallel 2 runs-on: ubuntu-20.04 coverage: diff --git a/trunk/3rdparty/srs-bench/blackbox/hevc_test.go b/trunk/3rdparty/srs-bench/blackbox/hevc_test.go index 9207557a4..8e66526ae 100644 --- a/trunk/3rdparty/srs-bench/blackbox/hevc_test.go +++ b/trunk/3rdparty/srs-bench/blackbox/hevc_test.go @@ -34,7 +34,7 @@ import ( "time" ) -func TestRtmpPublish_RtmpPlay_HEVC_Basic(t *testing.T) { +func TestSlow_RtmpPublish_RtmpPlay_HEVC_Basic(t *testing.T) { // This case is run in parallel. t.Parallel() @@ -124,7 +124,7 @@ func TestRtmpPublish_RtmpPlay_HEVC_Basic(t *testing.T) { } } -func TestRtmpPublish_HttpFlvPlay_HEVC_Basic(t *testing.T) { +func TestSlow_RtmpPublish_HttpFlvPlay_HEVC_Basic(t *testing.T) { // This case is run in parallel. t.Parallel() @@ -221,7 +221,7 @@ func TestRtmpPublish_HttpFlvPlay_HEVC_Basic(t *testing.T) { } } -func TestRtmpPublish_HttpTsPlay_HEVC_Basic(t *testing.T) { +func TestSlow_RtmpPublish_HttpTsPlay_HEVC_Basic(t *testing.T) { // This case is run in parallel. t.Parallel() @@ -317,7 +317,7 @@ func TestRtmpPublish_HttpTsPlay_HEVC_Basic(t *testing.T) { } } -func TestRtmpPublish_HlsPlay_HEVC_Basic(t *testing.T) { +func TestSlow_RtmpPublish_HlsPlay_HEVC_Basic(t *testing.T) { // This case is run in parallel. t.Parallel() @@ -375,11 +375,11 @@ func TestRtmpPublish_HlsPlay_HEVC_Basic(t *testing.T) { }() // Start FFprobe to detect and verify stream. - duration := time.Duration(*srsFFprobeDuration) * time.Millisecond + duration := time.Duration(*srsFFprobeDuration) * time.Millisecond * 2 ffprobe := NewFFprobe(func(v *ffprobeClient) { v.dvrFile = path.Join(svr.WorkDir(), "objs", fmt.Sprintf("srs-ffprobe-%v.ts", streamID)) v.streamURL = fmt.Sprintf("http://localhost:%v/live/%v.m3u8", svr.HTTPPort(), streamID) - v.duration, v.timeout = duration, time.Duration(*srsFFprobeTimeout)*time.Millisecond + v.duration, v.timeout = duration, time.Duration(*srsFFprobeTimeout)*time.Millisecond * 2 }) wg.Add(1) go func() { diff --git a/trunk/3rdparty/srs-bench/blackbox/hls_test.go b/trunk/3rdparty/srs-bench/blackbox/hls_test.go index 6117f1f6f..c4ec72401 100644 --- a/trunk/3rdparty/srs-bench/blackbox/hls_test.go +++ b/trunk/3rdparty/srs-bench/blackbox/hls_test.go @@ -33,7 +33,7 @@ import ( "time" ) -func TestRtmpPublish_HlsPlay_Basic(t *testing.T) { +func TestFast_RtmpPublish_HlsPlay_Basic(t *testing.T) { // This case is run in parallel. t.Parallel() diff --git a/trunk/3rdparty/srs-bench/blackbox/mp3_test.go b/trunk/3rdparty/srs-bench/blackbox/mp3_test.go index c5adc18c1..3960a93c4 100644 --- a/trunk/3rdparty/srs-bench/blackbox/mp3_test.go +++ b/trunk/3rdparty/srs-bench/blackbox/mp3_test.go @@ -33,7 +33,7 @@ import ( "time" ) -func TestRtmpPublish_RtmpPlay_CodecMP3_Basic(t *testing.T) { +func TestFast_RtmpPublish_RtmpPlay_CodecMP3_Basic(t *testing.T) { // This case is run in parallel. t.Parallel() @@ -117,7 +117,7 @@ func TestRtmpPublish_RtmpPlay_CodecMP3_Basic(t *testing.T) { } } -func TestRtmpPublish_HttpFlvPlay_CodecMP3_Basic(t *testing.T) { +func TestFast_RtmpPublish_HttpFlvPlay_CodecMP3_Basic(t *testing.T) { // This case is run in parallel. t.Parallel() @@ -208,7 +208,7 @@ func TestRtmpPublish_HttpFlvPlay_CodecMP3_Basic(t *testing.T) { } } -func TestRtmpPublish_HttpMp3Play_CodecMP3_Basic(t *testing.T) { +func TestFast_RtmpPublish_HttpMp3Play_CodecMP3_Basic(t *testing.T) { // This case is run in parallel. t.Parallel() @@ -296,7 +296,7 @@ func TestRtmpPublish_HttpMp3Play_CodecMP3_Basic(t *testing.T) { } } -func TestRtmpPublish_HttpTsPlay_CodecMP3_Basic(t *testing.T) { +func TestFast_RtmpPublish_HttpTsPlay_CodecMP3_Basic(t *testing.T) { // This case is run in parallel. t.Parallel() @@ -384,7 +384,7 @@ func TestRtmpPublish_HttpTsPlay_CodecMP3_Basic(t *testing.T) { } } -func TestRtmpPublish_HlsPlay_CodecMP3_Basic(t *testing.T) { +func TestFast_RtmpPublish_HlsPlay_CodecMP3_Basic(t *testing.T) { // This case is run in parallel. t.Parallel() diff --git a/trunk/3rdparty/srs-bench/blackbox/rtmp_test.go b/trunk/3rdparty/srs-bench/blackbox/rtmp_test.go index 47d60bd2a..b1e1e9a1a 100644 --- a/trunk/3rdparty/srs-bench/blackbox/rtmp_test.go +++ b/trunk/3rdparty/srs-bench/blackbox/rtmp_test.go @@ -33,7 +33,7 @@ import ( "time" ) -func TestRtmpPublish_RtmpPlay_Basic(t *testing.T) { +func TestFast_RtmpPublish_RtmpPlay_Basic(t *testing.T) { // This case is run in parallel. t.Parallel() @@ -110,7 +110,7 @@ func TestRtmpPublish_RtmpPlay_Basic(t *testing.T) { } } -func TestRtmpPublish_HttpFlvPlay_Basic(t *testing.T) { +func TestFast_RtmpPublish_HttpFlvPlay_Basic(t *testing.T) { // This case is run in parallel. t.Parallel() @@ -193,7 +193,7 @@ func TestRtmpPublish_HttpFlvPlay_Basic(t *testing.T) { } } -func TestRtmpPublish_RtmpPlay_ChunkSize128(t *testing.T) { +func TestFast_RtmpPublish_RtmpPlay_ChunkSize128(t *testing.T) { // This case is run in parallel. t.Parallel() @@ -274,7 +274,7 @@ func TestRtmpPublish_RtmpPlay_ChunkSize128(t *testing.T) { } } -func TestRtmpPublish_RtmpPlay_EnableATC(t *testing.T) { +func TestFast_RtmpPublish_RtmpPlay_EnableATC(t *testing.T) { // This case is run in parallel. t.Parallel()