Bug 1492873 [wpt PR 13113] - Handle case where mozlog is not installe…

…d., a=testonly

Automatic update from web-platform-testsHandle case where mozlog is not installed. (#13113)

In case that mozlog is present we need to ensure any lock it holds is
released in subprocesses. In case it's not present we don't need to do
anything, so don't fail if we can't import it.

Fixes web-platform-tests/wpt#13112.
--

wpt-commits: 1f8fa9e610d934490538812d6121a77baf646bfc
wpt-pr: 13113

UltraBlame original commit: ba995f8b27019322f6b01edc29c7d061145fba02

testing/web-platform/meta/MANIFEST.json

@@ -4402298,7 +4402298,7 @@ py
 :
 [
 "
-e8c6af20857d210aef792f7d78aaddd3fdd8adcf
+8f95bd492322a65a5bbb78430734b769730d9e35
 "
 "
 support

testing/web-platform/tests/tools/serve/serve.py

@@ -73,12 +73,6 @@
 js_meta_re
 parse_variants
 from
-mozlog
-.
-structuredlog
-import
-StructuredLogger
-from
 wptserve
 import
 server
@@ -5032,6 +5026,44 @@
 =
 None
 def
+release_mozlog_lock
+(
+)
+:
+
+try
+:
+
+from
+mozlog
+import
+StructuredLogger
+
+try
+:
+
+StructuredLogger
+.
+_lock
+.
+release
+(
+)
+
+except
+threading
+.
+ThreadError
+:
+
+pass
+
+except
+ImportError
+:
+
+pass
+def
 start_ws_server
 (
 host
@@ -5075,25 +5107,10 @@
 logging
 )
 
-try
-:
-
-StructuredLogger
-.
-_lock
-.
-release
+release_mozlog_lock
 (
 )
 
-except
-threading
-.
-ThreadError
-:
-
-pass
-
 return
 WebSocketDaemon
 (
@@ -5169,25 +5186,10 @@
 logging
 )
 
-try
-:
-
-StructuredLogger
-.
-_lock
-.
-release
+release_mozlog_lock
 (
 )
 
-except
-threading
-.
-ThreadError
-:
-
-pass
-
 return
 WebSocketDaemon
 (