From 8db992610770fd4f9710f044f3db57edf9bf850e Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Wed, 4 Sep 2019 14:02:55 +0200
Subject: [PATCH] log_handler test: Ignore unknown categories

Tests run parallel in multiple threads. This makes the log_handler test
flaky because it may see log messages triggered by other threads. Make
the handler ignore all messages not in the category we care about.
---
 gstreamer/src/log.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gstreamer/src/log.rs b/gstreamer/src/log.rs
index ad18a5623..75109cd94 100644
--- a/gstreamer/src/log.rs
+++ b/gstreamer/src/log.rs
@@ -457,7 +457,13 @@ mod tests {
                             _object: Option<&glib::Object>,
                             message: &DebugMessage| {
             let cat = DebugCategory::get("test-cat-log").unwrap();
-            assert_eq!(category, cat);
+
+            if category != cat {
+                // This test can run in parallel with other tests, including new_and_log above.
+                // We cannot be certain we only see our own messages.
+                return;
+            }
+
             assert_eq!(level, DebugLevel::Info);
             assert_eq!(message.get(), Some("meh"));
             let _ = sender.lock().unwrap().send(());