From d80a21d2f12dbc8d50adbd991dbd45b626f97ed0 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Fri, 10 Dec 2021 09:52:21 +0100 Subject: [PATCH] Relax gn check test. See the report at https://bugs.chromium.org/p/gn/issues/detail?id=271. Bug: None Change-Id: I6ddc12fc83f8f8eca985af9237e0b736814574fb Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/240522 Reviewed-by: Christoffer Jansson Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#35516} --- .../presubmit_checks_lib/build_helpers_test.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools_webrtc/presubmit_checks_lib/build_helpers_test.py b/tools_webrtc/presubmit_checks_lib/build_helpers_test.py index 5eab10556c..8c2438e8ed 100755 --- a/tools_webrtc/presubmit_checks_lib/build_helpers_test.py +++ b/tools_webrtc/presubmit_checks_lib/build_helpers_test.py @@ -8,6 +8,7 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. +import re import os import unittest @@ -19,15 +20,14 @@ TESTDATA_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), class GnCheckTest(unittest.TestCase): - def testCircularDependencyError(self): - test_dir = os.path.join(TESTDATA_DIR, 'circular_dependency') - expected_errors = [ - 'ERROR Dependency cycle:\n' - ' //:bar ->\n //:foo ->\n //:bar' - ] - self.assertListEqual(expected_errors, - build_helpers.RunGnCheck(test_dir)) + + def testCircularDependencyError(self): + test_dir = os.path.join(TESTDATA_DIR, 'circular_dependency') + expected_error = re.compile('ERROR Dependency cycle') + gn_output = build_helpers.RunGnCheck(test_dir) + self.assertEqual(1, len(gn_output)) + self.assertRegexpMatches(gn_output[0], expected_error) if __name__ == '__main__': - unittest.main() + unittest.main()