diff --git a/contrib/buildbot/ignore-logs.txt b/contrib/buildbot/ignore-logs.txt --- a/contrib/buildbot/ignore-logs.txt +++ b/contrib/buildbot/ignore-logs.txt @@ -1,3 +1,3 @@ # Wine occasionally deadlocks during cross-builds tests. It should be safe to # ignore until we're able to update wine with a version where this is fixed. -err:ntdll:RtlpWaitForCriticalSection section \\w* "\\?" wait timed out in thread \\d*, blocked by \\d*, retrying +err:ntdll:RtlpWaitForCriticalSection section \w* "\?" wait timed out in thread \d*, blocked by \d*, retrying diff --git a/contrib/buildbot/test/test_endpoint_status.py b/contrib/buildbot/test/test_endpoint_status.py --- a/contrib/buildbot/test/test_endpoint_status.py +++ b/contrib/buildbot/test/test_endpoint_status.py @@ -709,9 +709,9 @@ # Simple match b'err:ntdll:RtlpWaitForCriticalSection', # Greedy match with some escaped characters - b'\\d*:err:ntdll:RtlpWaitForCriticalSection section .* retrying \\(60 sec\\)', + br'\d*:err:ntdll:RtlpWaitForCriticalSection section .* retrying \(60 sec\)', # Less greedy match - b'err:ntdll:RtlpWaitForCriticalSection section \\w* "\\?" wait timed out in thread \\d*, blocked by \\d*, retrying', + br'err:ntdll:RtlpWaitForCriticalSection section \w* "\?" wait timed out in thread \d*, blocked by \d*, retrying', ] for pattern in testPatterns: self.teamcity.getIgnoreList.return_value = [