summaryrefslogtreecommitdiff
path: root/chromium/tools/mb/mb_unittest.py
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/tools/mb/mb_unittest.py
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/tools/mb/mb_unittest.py')
-rwxr-xr-xchromium/tools/mb/mb_unittest.py17
1 files changed, 11 insertions, 6 deletions
diff --git a/chromium/tools/mb/mb_unittest.py b/chromium/tools/mb/mb_unittest.py
index 6e8fe140440..60a74887ae5 100755
--- a/chromium/tools/mb/mb_unittest.py
+++ b/chromium/tools/mb/mb_unittest.py
@@ -11,10 +11,14 @@ from __future__ import absolute_import
import json
import os
import re
-import StringIO
import sys
import unittest
+if sys.version_info.major == 2:
+ from StringIO import StringIO
+else:
+ from io import StringIO
+
sys.path.insert(
0,
os.path.abspath(
@@ -385,7 +389,7 @@ class UnitTest(unittest.TestCase):
self.assertEqual(['all', 'foo_unittests'], out['compile_targets'])
def test_analyze_handles_way_too_many_results(self):
- too_many_files = ', '.join(['"//foo:foo%d"' % i for i in xrange(40 * 1024)])
+ too_many_files = ', '.join(['"//foo:foo%d"' % i for i in range(40 * 1024)])
files = {'/tmp/in.json': '''{\
"files": ["foo/foo_unittest.cc"],
"test_targets": ["foo_unittests"],
@@ -439,9 +443,10 @@ class UnitTest(unittest.TestCase):
self.check(['gen', '-m', 'fake_master', '-b', 'fake_args_bot',
'//out/Debug'],
mbw=mbw, ret=0)
- self.assertEqual(
- mbw.files['/fake_src/out/Debug/args.gn'],
- 'import("//build/args/bots/fake_master/fake_args_bot.gn")\n')
+ # TODO(https://crbug.com/1093038): This assert is inappropriately failing.
+ # self.assertEqual(
+ # mbw.files['/fake_src/out/Debug/args.gn'],
+ # 'import("//build/args/bots/fake_master/fake_args_bot.gn")\n')
def test_gen_args_file_mixins(self):
mbw = self.fake_mbw()
@@ -764,7 +769,7 @@ class UnitTest(unittest.TestCase):
def test_help(self):
orig_stdout = sys.stdout
try:
- sys.stdout = StringIO.StringIO()
+ sys.stdout = StringIO()
self.assertRaises(SystemExit, self.check, ['-h'])
self.assertRaises(SystemExit, self.check, ['help'])
self.assertRaises(SystemExit, self.check, ['help', 'gen'])