improve tests (#1965)

internal/core/rtmp_server_test.go

@@ -29,7 +29,7 @@ func TestRTMPServerRunOnConnect(t *testing.T) {
 	require.Equal(t, true, ok)
 	defer p.Close()
 
-	u, err := url.Parse("rtmp://127.0.0.1:1935/mystream")
+	u, err := url.Parse("rtmp://127.0.0.1:1935/teststream")
 	require.NoError(t, err)
 
 	nconn, err := net.Dial("tcp", u.Host)
@@ -47,19 +47,25 @@ func TestRTMPServerRunOnConnect(t *testing.T) {
 	require.Equal(t, "aa\n", string(byts))
 }
 
-func TestRTMPServerPublishRead(t *testing.T) {
+func TestRTMPServer(t *testing.T) {
-	for _, ca := range []string{"plain", "tls"} {
+	for _, encrypt := range []string{
-		t.Run(ca, func(t *testing.T) {
+		"plain",
+		"tls",
+	} {
+		for _, auth := range []string{
+			"none",
+			"internal",
+			"external",
+		} {
+			t.Run("encrypt_"+encrypt+"_auth_"+auth, func(t *testing.T) {
 				var port string
-			if ca == "plain" {
+				var conf string
+
+				if encrypt == "plain" {
 					port = "1935"
 
-				p, ok := newInstance("rtspDisable: yes\n" +
+					conf = "rtspDisable: yes\n" +
-					"hlsDisable: yes\n" +
+						"hlsDisable: yes\n"
-					"paths:\n" +
-					"  all:\n")
-				require.Equal(t, true, ok)
-				defer p.Close()
 				} else {
 					port = "1936"
 
@@ -71,32 +77,58 @@ func TestRTMPServerPublishRead(t *testing.T) {
 					require.NoError(t, err)
 					defer os.Remove(serverKeyFpath)
 
-				p, ok := newInstance("rtspDisable: yes\n" +
+					conf = "rtspDisable: yes\n" +
 						"hlsDisable: yes\n" +
 						"webrtcDisable: yes\n" +
 						"rtmpEncryption: \"yes\"\n" +
 						"rtmpServerCert: " + serverCertFpath + "\n" +
-					"rtmpServerKey: " + serverKeyFpath + "\n" +
+						"rtmpServerKey: " + serverKeyFpath + "\n"
+				}
+
+				switch auth {
+				case "none":
+					conf += "paths:\n" +
+						"  all:\n"
+
+				case "internal":
+					conf += "paths:\n" +
+						"  all:\n" +
+						"    publishUser: testpublisher\n" +
+						"    publishPass: testpass\n" +
+						"    publishIPs: [127.0.0.0/16]\n" +
+						"    readUser: testreader\n" +
+						"    readPass: testpass\n" +
+						"    readIPs: [127.0.0.0/16]\n"
+
+				case "external":
+					conf += "externalAuthenticationURL: http://localhost:9120/auth\n" +
 						"paths:\n" +
-					"  all:\n")
+						"  all:\n"
+				}
+
+				p, ok := newInstance(conf)
 				require.Equal(t, true, ok)
 				defer p.Close()
+
+				var a *testHTTPAuthenticator
+				if auth == "external" {
+					a = newTestHTTPAuthenticator(t, "rtmp", "publish")
 				}
 
-			u, err := url.Parse("rtmp://127.0.0.1:" + port + "/mystream")
+				u1, err := url.Parse("rtmp://127.0.0.1:" + port + "/teststream?user=testpublisher&pass=testpass&param=value")
 				require.NoError(t, err)
 
 				nconn1, err := func() (net.Conn, error) {
-				if ca == "plain" {
+					if encrypt == "plain" {
-					return net.Dial("tcp", u.Host)
+						return net.Dial("tcp", u1.Host)
 					}
-				return tls.Dial("tcp", u.Host, &tls.Config{InsecureSkipVerify: true})
+					return tls.Dial("tcp", u1.Host, &tls.Config{InsecureSkipVerify: true})
 				}()
 				require.NoError(t, err)
 				defer nconn1.Close()
 				conn1 := rtmp.NewConn(nconn1)
 
-			err = conn1.InitializeClient(u, true)
+				err = conn1.InitializeClient(u1, true)
 				require.NoError(t, err)
 
 				videoTrack := &formats.H264{
@@ -127,17 +159,26 @@ func TestRTMPServerPublishRead(t *testing.T) {
 
 				time.Sleep(500 * time.Millisecond)
 
+				if auth == "external" {
+					a.close()
+					a = newTestHTTPAuthenticator(t, "rtmp", "read")
+					defer a.close()
+				}
+
+				u2, err := url.Parse("rtmp://127.0.0.1:" + port + "/teststream?user=testreader&pass=testpass&param=value")
+				require.NoError(t, err)
+
 				nconn2, err := func() (net.Conn, error) {
-				if ca == "plain" {
+					if encrypt == "plain" {
-					return net.Dial("tcp", u.Host)
+						return net.Dial("tcp", u2.Host)
 					}
-				return tls.Dial("tcp", u.Host, &tls.Config{InsecureSkipVerify: true})
+					return tls.Dial("tcp", u2.Host, &tls.Config{InsecureSkipVerify: true})
 				}()
 				require.NoError(t, err)
 				defer nconn2.Close()
 				conn2 := rtmp.NewConn(nconn2)
 
-			err = conn2.InitializeClient(u, false)
+				err = conn2.InitializeClient(u2, false)
 				require.NoError(t, err)
 
 				videoTrack1, audioTrack2, err := conn2.ReadTracks()
@@ -180,88 +221,6 @@ func TestRTMPServerPublishRead(t *testing.T) {
 			})
 		}
 	}
-
-func TestRTMPServerAuth(t *testing.T) {
-	for _, ca := range []string{
-		"internal",
-		"external",
-	} {
-		t.Run(ca, func(t *testing.T) {
-			var conf string
-			if ca == "internal" {
-				conf = "paths:\n" +
-					"  all:\n" +
-					"    publishUser: testpublisher\n" +
-					"    publishPass: testpass\n" +
-					"    publishIPs: [127.0.0.0/16]\n" +
-					"    readUser: testreader\n" +
-					"    readPass: testpass\n" +
-					"    readIPs: [127.0.0.0/16]\n"
-			} else {
-				conf = "externalAuthenticationURL: http://localhost:9120/auth\n" +
-					"paths:\n" +
-					"  all:\n"
-			}
-
-			p, ok := newInstance(conf)
-			require.Equal(t, true, ok)
-			defer p.Close()
-
-			var a *testHTTPAuthenticator
-			if ca == "external" {
-				a = newTestHTTPAuthenticator(t, "rtmp", "publish")
-			}
-
-			u1, err := url.Parse("rtmp://127.0.0.1:1935/teststream?user=testpublisher&pass=testpass&param=value")
-			require.NoError(t, err)
-
-			nconn1, err := net.Dial("tcp", u1.Host)
-			require.NoError(t, err)
-			defer nconn1.Close()
-			conn1 := rtmp.NewConn(nconn1)
-
-			err = conn1.InitializeClient(u1, true)
-			require.NoError(t, err)
-
-			videoTrack := &formats.H264{
-				PayloadTyp: 96,
-				SPS: []byte{
-					0x67, 0x64, 0x00, 0x0c, 0xac, 0x3b, 0x50, 0xb0,
-					0x4b, 0x42, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00,
-					0x00, 0x03, 0x00, 0x3d, 0x08,
-				},
-				PPS: []byte{
-					0x68, 0xee, 0x3c, 0x80,
-				},
-				PacketizationMode: 1,
-			}
-
-			err = conn1.WriteTracks(videoTrack, nil)
-			require.NoError(t, err)
-
-			time.Sleep(500 * time.Millisecond)
-
-			if ca == "external" {
-				a.close()
-				a = newTestHTTPAuthenticator(t, "rtmp", "read")
-				defer a.close()
-			}
-
-			u2, err := url.Parse("rtmp://127.0.0.1:1935/teststream?user=testreader&pass=testpass&param=value")
-			require.NoError(t, err)
-
-			nconn2, err := net.Dial("tcp", u2.Host)
-			require.NoError(t, err)
-			defer nconn2.Close()
-			conn2 := rtmp.NewConn(nconn2)
-
-			err = conn2.InitializeClient(u2, false)
-			require.NoError(t, err)
-
-			_, _, err = conn2.ReadTracks()
-			require.NoError(t, err)
-		})
-	}
 }
 
 func TestRTMPServerAuthFail(t *testing.T) {

internal/core/rtsp_server_test.go

@@ -40,14 +40,21 @@ func TestRTSPServerRunOnConnect(t *testing.T) {
 	require.Equal(t, "aa\n", string(byts))
 }
 
-func TestRTSPServerAuth(t *testing.T) {
+func TestRTSPServer(t *testing.T) {
-	for _, ca := range []string{
+	for _, auth := range []string{
+		"none",
 		"internal",
 		"external",
 	} {
-		t.Run(ca, func(t *testing.T) {
+		t.Run("auth_"+auth, func(t *testing.T) {
 			var conf string
-			if ca == "internal" {
+
+			switch auth {
+			case "none":
+				conf = "paths:\n" +
+					"  all:\n"
+
+			case "internal":
 				conf = "rtmpDisable: yes\n" +
 					"hlsDisable: yes\n" +
 					"webrtcDisable: yes\n" +
@@ -59,7 +66,8 @@ func TestRTSPServerAuth(t *testing.T) {
 					"    readUser: testreader\n" +
 					"    readPass: testpass\n" +
 					"    readIPs: [127.0.0.0/16]\n"
-			} else {
+
+			case "external":
 				conf = "externalAuthenticationURL: http://localhost:9120/auth\n" +
 					"paths:\n" +
 					"  all:\n"
@@ -70,7 +78,7 @@ func TestRTSPServerAuth(t *testing.T) {
 			defer p.Close()
 
 			var a *testHTTPAuthenticator
-			if ca == "external" {
+			if auth == "external" {
 				a = newTestHTTPAuthenticator(t, "rtsp", "publish")
 			}
 
@@ -84,7 +92,7 @@ func TestRTSPServerAuth(t *testing.T) {
 			require.NoError(t, err)
 			defer source.Close()
 
-			if ca == "external" {
+			if auth == "external" {
 				a.close()
 				a = newTestHTTPAuthenticator(t, "rtsp", "read")
 				defer a.close()
@@ -109,8 +117,9 @@ func TestRTSPServerAuth(t *testing.T) {
 			require.NoError(t, err)
 		})
 	}
+}
 
-	t.Run("hashed", func(t *testing.T) {
+func TestRTSPServerAuthHashed(t *testing.T) {
 	p, ok := newInstance(
 		"rtmpDisable: yes\n" +
 			"hlsDisable: yes\n" +
@@ -131,7 +140,6 @@ func TestRTSPServerAuth(t *testing.T) {
 		media.Medias{medi})
 	require.NoError(t, err)
 	defer source.Close()
-	})
 }
 
 func TestRTSPServerAuthFail(t *testing.T) {