From 4e066d6c33b91a139fc37720add8b98db335d1ec Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 4 Oct 2020 21:05:42 +0200 Subject: [PATCH] If ffmpeg returns an error, then test failed --- stream/forwarding/forwarding_test.go | 12 ++---------- stream/srt/srt_test.go | 4 +--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/stream/forwarding/forwarding_test.go b/stream/forwarding/forwarding_test.go index 69064c7..e69edde 100644 --- a/stream/forwarding/forwarding_test.go +++ b/stream/forwarding/forwarding_test.go @@ -2,7 +2,6 @@ package forwarding import ( "bufio" - "log" "os/exec" "testing" "time" @@ -41,7 +40,7 @@ func TestForwardStream(t *testing.T) { go func() { scanner := bufio.NewScanner(forwardingErrOutput) for scanner.Scan() { - log.Printf("[FFMPEG FORWARD TEST] %s", scanner.Text()) + t.Fatalf("ffmpeg virtual RTMP server returned %s", scanner.Text()) } }() @@ -72,18 +71,11 @@ func TestForwardStream(t *testing.T) { go func() { scanner := bufio.NewScanner(errOutput) for scanner.Scan() { - log.Printf("[FFMPEG TEST] %s", scanner.Text()) + t.Fatalf("ffmpeg virtual source returned %s", scanner.Text()) } }() time.Sleep(5 * time.Second) // Delay is in nanoseconds, here 5s - // FIXME - //if ffmpegInputStreams["demo"] == nil { - //t.Errorf("Stream forwarding does not appear to be working") - //} - - // TODO Check that FFMPEG has no error - // TODO Check that the stream ran // TODO Kill SRT server } diff --git a/stream/srt/srt_test.go b/stream/srt/srt_test.go index 35e20b8..8d21e05 100644 --- a/stream/srt/srt_test.go +++ b/stream/srt/srt_test.go @@ -2,7 +2,6 @@ package srt import ( "bufio" - "log" "os/exec" "testing" "time" @@ -54,12 +53,11 @@ func TestServeSRT(t *testing.T) { go func() { scanner := bufio.NewScanner(errOutput) for scanner.Scan() { - log.Printf("[FFMPEG TEST] %s", scanner.Text()) + t.Fatalf("ffmpeg virtual source returned %s", scanner.Text()) } }() time.Sleep(5 * time.Second) // Delay is in nanoseconds, here 5s - // TODO Check that the stream ran // TODO Kill SRT server }