fix participant tests (#854)

* fix participant tests * more updates
livekit · Feb 7, 2025 · c9a1b82 · c9a1b82
1 parent ddd2ee1
commit c9a1b82
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/build/egress/Dockerfile b/build/egress/Dockerfile
@@ -79,7 +79,6 @@ RUN useradd -ms /bin/bash -g root -G sudo,pulse,pulse-access egress
 RUN mkdir -p home/egress/tmp home/egress/.cache/xdgr && \
     chown -R egress /home/egress
 
-
 # copy files
 COPY --from=0 /workspace/egress /bin/
 COPY --from=0 /tini /tini

diff --git a/build/test/Dockerfile b/build/test/Dockerfile
@@ -25,6 +25,11 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GOARCH=arm64; else GOARCH=amd
     tar -C /usr/local -xzf go1.22.1.linux-${GOARCH}.tar.gz
 ENV PATH="/usr/local/go/bin:${PATH}"
 
+# download samples
+RUN apt-get update && apt-get install -y git-lfs
+RUN git clone --depth 1 https://github.com/livekit/media-samples.git
+RUN cd media-samples && git lfs pull
+
 # download go modules
 COPY go.mod .
 COPY go.sum .
@@ -96,13 +101,9 @@ RUN mkdir -p home/egress/tmp home/egress/.cache/xdgr && \
 COPY test/ /workspace/test/
 COPY --from=0 /workspace/egress /bin/
 COPY --from=0 /workspace/test.test .
+COPY --from=0 /workspace/media-samples /media-samples
 COPY build/test/entrypoint.sh .
 
-# download samples
-RUN apt-get update && apt-get install -y git-lfs
-RUN git clone --depth 1 https://github.com/livekit/media-samples.git
-RUN cd media-samples && git lfs pull
-
 # run tests
 USER egress
 ENV PATH=${PATH}:/chrome

diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go
@@ -68,7 +68,10 @@ func NewProcessLogger(handlerID, egressID string) *ProcessLogger {
 
 func (l *ProcessLogger) Write(p []byte) (n int, err error) {
 	s := string(p)
-	if strings.HasPrefix(s, "00:00:") {
+	if strings.HasSuffix(s, "}\n") {
+		// normal handler logs
+		fmt.Print(s)
+	} else if strings.HasPrefix(s, "0:00:") {
 		// ignore cuda and template not mapped gstreamer warnings
 	} else if strings.HasPrefix(s, "turnc") {
 		// warn on turnc error
@@ -77,6 +80,7 @@ func (l *ProcessLogger) Write(p []byte) (n int, err error) {
 		// panics and unexpected errors
 		l.logger.Errorw(s, nil)
 	}
+
 	return len(p), nil
 }
 

diff --git a/test/integration.go b/test/integration.go
@@ -82,12 +82,17 @@ func (r *Runner) run(t *testing.T, test *testCase, f func(*testing.T, *testCase)
 func (r *Runner) awaitIdle(t *testing.T) {
 	r.svc.KillAll()
 	for i := 0; i < 30; i++ {
-		if r.svc.IsIdle() {
+		if r.svc.IsIdle() && len(r.room.LocalParticipant.TrackPublications()) == 0 {
 			return
 		}
 		time.Sleep(time.Second)
 	}
-	t.Fatal("service not idle after 30s")
+
+	if !r.svc.IsIdle() {
+		t.Fatal("service not idle after 30s")
+	} else if len(r.room.LocalParticipant.TrackPublications()) != 0 {
+		t.Fatal("room still has tracks after 30s")
+	}
 }
 
 func (r *Runner) startEgress(t *testing.T, req *rpc.StartEgressRequest) string {

diff --git a/test/publish.go b/test/publish.go
@@ -83,10 +83,6 @@ func (r *Runner) publishSample(t *testing.T, codec types.MimeType, publishAfter,
 					_ = r.room.LocalParticipant.UnpublishTrack(pub.SID())
 				}
 			})
-		} else {
-			t.Cleanup(func() {
-				_ = r.room.LocalParticipant.UnpublishTrack(pub.SID())
-			})
 		}
 	})
 
@@ -133,5 +129,10 @@ func (r *Runner) publish(t *testing.T, codec types.MimeType, done chan struct{})
 	pub, err = r.room.LocalParticipant.PublishTrack(track, &lksdk.TrackPublicationOptions{Name: filename})
 	require.NoError(t, err)
 
+	trackID := pub.SID()
+	t.Cleanup(func() {
+		_ = r.room.LocalParticipant.UnpublishTrack(trackID)
+	})
+
 	return pub
 }