diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json index 4106512ed0bf0..4bfd7089629e5 100644 --- a/testing/web-platform/meta/MANIFEST.json +++ b/testing/web-platform/meta/MANIFEST.json @@ -4402298,7 +4402298,7 @@ py : [ " -e8c6af20857d210aef792f7d78aaddd3fdd8adcf +8f95bd492322a65a5bbb78430734b769730d9e35 " " support diff --git a/testing/web-platform/tests/tools/serve/serve.py b/testing/web-platform/tests/tools/serve/serve.py index ea428a74ac771..8f1462647c279 100644 --- a/testing/web-platform/tests/tools/serve/serve.py +++ b/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 (