Fix mb.py presubmit issues.
* Add a config file for python formatting (.style.yapf). * Change the default indentation from 4 spaces to 2 spaces. * Run 'git cl format --python' on a few python files. Bug: webrtc:13413 Change-Id: Ia71135131276c2c499b00032d57ad16ee5200a5c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/238982 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Christoffer Jansson <jansson@google.com> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Jeremy Leconte <jleconte@google.com> Cr-Commit-Position: refs/heads/main@{#35500}
This commit is contained in:
Jeremy Leconte
committed by
WebRTC LUCI CQ
WebRTC LUCI CQ
parent
035f0446c8
commit
f22c78b01a
@ -12,9 +12,9 @@
|
||||
import ast
|
||||
import json
|
||||
try:
|
||||
from StringIO import StringIO # for Python2
|
||||
from StringIO import StringIO # for Python2
|
||||
except ImportError:
|
||||
from io import StringIO # for Python3
|
||||
from io import StringIO # for Python3
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
@ -61,7 +61,7 @@ class FakeMBW(mb.MetaBuildWrapper):
|
||||
|
||||
def Exists(self, path):
|
||||
abs_path = self._AbsPath(path)
|
||||
return (self.files.get(abs_path) is not None or abs_path in self.dirs)
|
||||
return self.files.get(abs_path) is not None or abs_path in self.dirs
|
||||
|
||||
def MaybeMakeDirectory(self, path):
|
||||
abpath = self._AbsPath(path)
|
||||
@ -132,7 +132,7 @@ class FakeFile(object):
|
||||
self.buf += contents
|
||||
|
||||
def close(self):
|
||||
self.files[self.name] = self.buf
|
||||
self.files[self.name] = self.buf
|
||||
|
||||
|
||||
TEST_CONFIG = """\
|
||||
@ -186,8 +186,7 @@ class UnitTest(unittest.TestCase):
|
||||
mbw = FakeMBW(win32=win32)
|
||||
mbw.files.setdefault(mbw.default_config, TEST_CONFIG)
|
||||
mbw.files.setdefault(
|
||||
mbw.ToAbsPath('//testing/buildbot/gn_isolate_map.pyl'),
|
||||
'''{
|
||||
mbw.ToAbsPath('//testing/buildbot/gn_isolate_map.pyl'), '''{
|
||||
"foo_unittests": {
|
||||
"label": "//foo:foo_unittests",
|
||||
"type": "console_test_launcher",
|
||||
@ -202,7 +201,13 @@ class UnitTest(unittest.TestCase):
|
||||
mbw.files[path] = contents
|
||||
return mbw
|
||||
|
||||
def check(self, args, mbw=None, files=None, out=None, err=None, ret=None,
|
||||
def check(self,
|
||||
args,
|
||||
mbw=None,
|
||||
files=None,
|
||||
out=None,
|
||||
err=None,
|
||||
ret=None,
|
||||
env=None):
|
||||
if not mbw:
|
||||
mbw = self.fake_mbw(files)
|
||||
@ -223,33 +228,43 @@ class UnitTest(unittest.TestCase):
|
||||
return mbw
|
||||
|
||||
def test_analyze(self):
|
||||
files = {'/tmp/in.json': '''{\
|
||||
files = {
|
||||
'/tmp/in.json':
|
||||
'''{\
|
||||
"files": ["foo/foo_unittest.cc"],
|
||||
"test_targets": ["foo_unittests"],
|
||||
"additional_compile_targets": ["all"]
|
||||
}''',
|
||||
'/tmp/out.json.gn': '''{\
|
||||
'/tmp/out.json.gn':
|
||||
'''{\
|
||||
"status": "Found dependency",
|
||||
"compile_targets": ["//foo:foo_unittests"],
|
||||
"test_targets": ["//foo:foo_unittests"]
|
||||
}'''}
|
||||
}'''
|
||||
}
|
||||
|
||||
mbw = self.fake_mbw(files)
|
||||
mbw.Call = lambda cmd, env=None, buffer_output=True: (0, '', '')
|
||||
|
||||
self.check(['analyze', '-c', 'debug_goma', '//out/Default',
|
||||
'/tmp/in.json', '/tmp/out.json'], mbw=mbw, ret=0)
|
||||
self.check([
|
||||
'analyze', '-c', 'debug_goma', '//out/Default', '/tmp/in.json',
|
||||
'/tmp/out.json'
|
||||
],
|
||||
mbw=mbw,
|
||||
ret=0)
|
||||
out = json.loads(mbw.files['/tmp/out.json'])
|
||||
self.assertEqual(out, {
|
||||
'status': 'Found dependency',
|
||||
'compile_targets': ['foo:foo_unittests'],
|
||||
'test_targets': ['foo_unittests']
|
||||
})
|
||||
self.assertEqual(
|
||||
out, {
|
||||
'status': 'Found dependency',
|
||||
'compile_targets': ['foo:foo_unittests'],
|
||||
'test_targets': ['foo_unittests']
|
||||
})
|
||||
|
||||
def test_gen(self):
|
||||
mbw = self.fake_mbw()
|
||||
self.check(['gen', '-c', 'debug_goma', '//out/Default', '-g', '/goma'],
|
||||
mbw=mbw, ret=0)
|
||||
mbw=mbw,
|
||||
ret=0)
|
||||
self.assertMultiLineEqual(mbw.files['/fake_src/out/Default/args.gn'],
|
||||
('goma_dir = "/goma"\n'
|
||||
'is_debug = true\n'
|
||||
@ -262,23 +277,25 @@ class UnitTest(unittest.TestCase):
|
||||
|
||||
mbw = self.fake_mbw(win32=True)
|
||||
self.check(['gen', '-c', 'debug_goma', '-g', 'c:\\goma', '//out/Debug'],
|
||||
mbw=mbw, ret=0)
|
||||
mbw=mbw,
|
||||
ret=0)
|
||||
self.assertMultiLineEqual(mbw.files['c:\\fake_src\\out\\Debug\\args.gn'],
|
||||
('goma_dir = "c:\\\\goma"\n'
|
||||
'is_debug = true\n'
|
||||
'use_goma = true\n'))
|
||||
self.assertIn('c:\\fake_src\\buildtools\\win\\gn.exe gen //out/Debug '
|
||||
'--check\n', mbw.out)
|
||||
self.assertIn(
|
||||
'c:\\fake_src\\buildtools\\win\\gn.exe gen //out/Debug '
|
||||
'--check\n', mbw.out)
|
||||
|
||||
mbw = self.fake_mbw()
|
||||
self.check(['gen', '-m', 'fake_group', '-b', 'fake_args_bot',
|
||||
'//out/Debug'],
|
||||
mbw=mbw, ret=0)
|
||||
self.check(
|
||||
['gen', '-m', 'fake_group', '-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_group/fake_args_bot.gn")\n\n')
|
||||
|
||||
|
||||
def test_gen_fails(self):
|
||||
mbw = self.fake_mbw()
|
||||
mbw.Call = lambda cmd, env=None, buffer_output=True: (1, '', '')
|
||||
@ -286,46 +303,47 @@ class UnitTest(unittest.TestCase):
|
||||
|
||||
def test_gen_swarming(self):
|
||||
files = {
|
||||
'/tmp/swarming_targets': 'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl': (
|
||||
"{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'raw',"
|
||||
" 'args': [],"
|
||||
"}}\n"
|
||||
),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps': (
|
||||
"base_unittests\n"
|
||||
),
|
||||
'/tmp/swarming_targets':
|
||||
'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl':
|
||||
("{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'raw',"
|
||||
" 'args': [],"
|
||||
"}}\n"),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps':
|
||||
("base_unittests\n"),
|
||||
}
|
||||
mbw = self.fake_mbw(files)
|
||||
self.check(['gen',
|
||||
'-c', 'debug_goma',
|
||||
'--swarming-targets-file', '/tmp/swarming_targets',
|
||||
'//out/Default'], mbw=mbw, ret=0)
|
||||
self.assertIn('/fake_src/out/Default/base_unittests.isolate',
|
||||
mbw.files)
|
||||
self.check([
|
||||
'gen', '-c', 'debug_goma', '--swarming-targets-file',
|
||||
'/tmp/swarming_targets', '//out/Default'
|
||||
],
|
||||
mbw=mbw,
|
||||
ret=0)
|
||||
self.assertIn('/fake_src/out/Default/base_unittests.isolate', mbw.files)
|
||||
self.assertIn('/fake_src/out/Default/base_unittests.isolated.gen.json',
|
||||
mbw.files)
|
||||
|
||||
def test_gen_swarming_android(self):
|
||||
test_files = {
|
||||
'/tmp/swarming_targets': 'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl': (
|
||||
"{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'additional_compile_target',"
|
||||
"}}\n"
|
||||
),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps': (
|
||||
"base_unittests\n"
|
||||
),
|
||||
'/tmp/swarming_targets':
|
||||
'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl':
|
||||
("{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'additional_compile_target',"
|
||||
"}}\n"),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps':
|
||||
("base_unittests\n"),
|
||||
}
|
||||
mbw = self.check(['gen', '-c', 'android_bot', '//out/Default',
|
||||
'--swarming-targets-file', '/tmp/swarming_targets',
|
||||
'--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'],
|
||||
files=test_files, ret=0)
|
||||
mbw = self.check([
|
||||
'gen', '-c', 'android_bot', '//out/Default', '--swarming-targets-file',
|
||||
'/tmp/swarming_targets', '--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'
|
||||
],
|
||||
files=test_files,
|
||||
ret=0)
|
||||
|
||||
isolate_file = mbw.files['/fake_src/out/Default/base_unittests.isolate']
|
||||
isolate_file_contents = ast.literal_eval(isolate_file)
|
||||
@ -337,30 +355,34 @@ class UnitTest(unittest.TestCase):
|
||||
self.assertEqual(command, [
|
||||
'vpython',
|
||||
'../../build/android/test_wrapper/logdog_wrapper.py',
|
||||
'--target', 'base_unittests',
|
||||
'--logdog-bin-cmd', '../../bin/logdog_butler',
|
||||
'--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
|
||||
'--target',
|
||||
'base_unittests',
|
||||
'--logdog-bin-cmd',
|
||||
'../../bin/logdog_butler',
|
||||
'--logcat-output-file',
|
||||
'${ISOLATED_OUTDIR}/logcats',
|
||||
'--store-tombstones',
|
||||
])
|
||||
|
||||
def test_gen_swarming_android_junit_test(self):
|
||||
test_files = {
|
||||
'/tmp/swarming_targets': 'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl': (
|
||||
"{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'junit_test',"
|
||||
"}}\n"
|
||||
),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps': (
|
||||
"base_unittests\n"
|
||||
),
|
||||
'/tmp/swarming_targets':
|
||||
'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl':
|
||||
("{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'junit_test',"
|
||||
"}}\n"),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps':
|
||||
("base_unittests\n"),
|
||||
}
|
||||
mbw = self.check(['gen', '-c', 'android_bot', '//out/Default',
|
||||
'--swarming-targets-file', '/tmp/swarming_targets',
|
||||
'--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'],
|
||||
files=test_files, ret=0)
|
||||
mbw = self.check([
|
||||
'gen', '-c', 'android_bot', '//out/Default', '--swarming-targets-file',
|
||||
'/tmp/swarming_targets', '--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'
|
||||
],
|
||||
files=test_files,
|
||||
ret=0)
|
||||
|
||||
isolate_file = mbw.files['/fake_src/out/Default/base_unittests.isolate']
|
||||
isolate_file_contents = ast.literal_eval(isolate_file)
|
||||
@ -372,31 +394,35 @@ class UnitTest(unittest.TestCase):
|
||||
self.assertEqual(command, [
|
||||
'vpython',
|
||||
'../../build/android/test_wrapper/logdog_wrapper.py',
|
||||
'--target', 'base_unittests',
|
||||
'--logdog-bin-cmd', '../../bin/logdog_butler',
|
||||
'--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
|
||||
'--target',
|
||||
'base_unittests',
|
||||
'--logdog-bin-cmd',
|
||||
'../../bin/logdog_butler',
|
||||
'--logcat-output-file',
|
||||
'${ISOLATED_OUTDIR}/logcats',
|
||||
'--store-tombstones',
|
||||
])
|
||||
|
||||
def test_gen_timeout(self):
|
||||
test_files = {
|
||||
'/tmp/swarming_targets': 'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl': (
|
||||
"{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'non_parallel_console_test_launcher',"
|
||||
" 'timeout': 500,"
|
||||
"}}\n"
|
||||
),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps': (
|
||||
"base_unittests\n"
|
||||
),
|
||||
'/tmp/swarming_targets':
|
||||
'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl':
|
||||
("{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'non_parallel_console_test_launcher',"
|
||||
" 'timeout': 500,"
|
||||
"}}\n"),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps':
|
||||
("base_unittests\n"),
|
||||
}
|
||||
mbw = self.check(['gen', '-c', 'debug_goma', '//out/Default',
|
||||
'--swarming-targets-file', '/tmp/swarming_targets',
|
||||
'--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'],
|
||||
files=test_files, ret=0)
|
||||
mbw = self.check([
|
||||
'gen', '-c', 'debug_goma', '//out/Default', '--swarming-targets-file',
|
||||
'/tmp/swarming_targets', '--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'
|
||||
],
|
||||
files=test_files,
|
||||
ret=0)
|
||||
|
||||
isolate_file = mbw.files['/fake_src/out/Default/base_unittests.isolate']
|
||||
isolate_file_contents = ast.literal_eval(isolate_file)
|
||||
@ -430,24 +456,25 @@ class UnitTest(unittest.TestCase):
|
||||
|
||||
def test_gen_script(self):
|
||||
test_files = {
|
||||
'/tmp/swarming_targets': 'base_unittests_script\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl': (
|
||||
"{'base_unittests_script': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'script',"
|
||||
" 'script': '//base/base_unittests_script.py',"
|
||||
"}}\n"
|
||||
),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps': (
|
||||
"base_unittests\n"
|
||||
"base_unittests_script.py\n"
|
||||
),
|
||||
'/tmp/swarming_targets':
|
||||
'base_unittests_script\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl':
|
||||
("{'base_unittests_script': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'script',"
|
||||
" 'script': '//base/base_unittests_script.py',"
|
||||
"}}\n"),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps':
|
||||
("base_unittests\n"
|
||||
"base_unittests_script.py\n"),
|
||||
}
|
||||
mbw = self.check(['gen', '-c', 'debug_goma', '//out/Default',
|
||||
'--swarming-targets-file', '/tmp/swarming_targets',
|
||||
'--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'],
|
||||
files=test_files, ret=0)
|
||||
mbw = self.check([
|
||||
'gen', '-c', 'debug_goma', '//out/Default', '--swarming-targets-file',
|
||||
'/tmp/swarming_targets', '--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'
|
||||
],
|
||||
files=test_files,
|
||||
ret=0)
|
||||
|
||||
isolate_file = (
|
||||
mbw.files['/fake_src/out/Default/base_unittests_script.isolate'])
|
||||
@ -466,22 +493,23 @@ class UnitTest(unittest.TestCase):
|
||||
|
||||
def test_gen_raw(self):
|
||||
test_files = {
|
||||
'/tmp/swarming_targets': 'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl': (
|
||||
"{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'raw',"
|
||||
"}}\n"
|
||||
),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps': (
|
||||
"base_unittests\n"
|
||||
),
|
||||
'/tmp/swarming_targets':
|
||||
'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl':
|
||||
("{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'raw',"
|
||||
"}}\n"),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps':
|
||||
("base_unittests\n"),
|
||||
}
|
||||
mbw = self.check(['gen', '-c', 'debug_goma', '//out/Default',
|
||||
'--swarming-targets-file', '/tmp/swarming_targets',
|
||||
'--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'],
|
||||
files=test_files, ret=0)
|
||||
mbw = self.check([
|
||||
'gen', '-c', 'debug_goma', '//out/Default', '--swarming-targets-file',
|
||||
'/tmp/swarming_targets', '--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'
|
||||
],
|
||||
files=test_files,
|
||||
ret=0)
|
||||
|
||||
isolate_file = mbw.files['/fake_src/out/Default/base_unittests.isolate']
|
||||
isolate_file_contents = ast.literal_eval(isolate_file)
|
||||
@ -508,22 +536,23 @@ class UnitTest(unittest.TestCase):
|
||||
|
||||
def test_gen_non_parallel_console_test_launcher(self):
|
||||
test_files = {
|
||||
'/tmp/swarming_targets': 'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl': (
|
||||
"{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'non_parallel_console_test_launcher',"
|
||||
"}}\n"
|
||||
),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps': (
|
||||
"base_unittests\n"
|
||||
),
|
||||
'/tmp/swarming_targets':
|
||||
'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl':
|
||||
("{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'non_parallel_console_test_launcher',"
|
||||
"}}\n"),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps':
|
||||
("base_unittests\n"),
|
||||
}
|
||||
mbw = self.check(['gen', '-c', 'debug_goma', '//out/Default',
|
||||
'--swarming-targets-file', '/tmp/swarming_targets',
|
||||
'--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'],
|
||||
files=test_files, ret=0)
|
||||
mbw = self.check([
|
||||
'gen', '-c', 'debug_goma', '//out/Default', '--swarming-targets-file',
|
||||
'/tmp/swarming_targets', '--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'
|
||||
],
|
||||
files=test_files,
|
||||
ret=0)
|
||||
|
||||
isolate_file = mbw.files['/fake_src/out/Default/base_unittests.isolate']
|
||||
isolate_file_contents = ast.literal_eval(isolate_file)
|
||||
@ -557,23 +586,24 @@ class UnitTest(unittest.TestCase):
|
||||
|
||||
def test_isolate_windowed_test_launcher_linux(self):
|
||||
test_files = {
|
||||
'/tmp/swarming_targets': 'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl': (
|
||||
"{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'windowed_test_launcher',"
|
||||
"}}\n"
|
||||
),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps': (
|
||||
"base_unittests\n"
|
||||
"some_resource_file\n"
|
||||
),
|
||||
'/tmp/swarming_targets':
|
||||
'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl':
|
||||
("{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'windowed_test_launcher',"
|
||||
"}}\n"),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps':
|
||||
("base_unittests\n"
|
||||
"some_resource_file\n"),
|
||||
}
|
||||
mbw = self.check(['gen', '-c', 'debug_goma', '//out/Default',
|
||||
'--swarming-targets-file', '/tmp/swarming_targets',
|
||||
'--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'],
|
||||
files=test_files, ret=0)
|
||||
mbw = self.check([
|
||||
'gen', '-c', 'debug_goma', '//out/Default', '--swarming-targets-file',
|
||||
'/tmp/swarming_targets', '--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'
|
||||
],
|
||||
files=test_files,
|
||||
ret=0)
|
||||
|
||||
isolate_file = mbw.files['/fake_src/out/Default/base_unittests.isolate']
|
||||
isolate_file_contents = ast.literal_eval(isolate_file)
|
||||
@ -608,26 +638,26 @@ class UnitTest(unittest.TestCase):
|
||||
|
||||
def test_gen_windowed_test_launcher_win(self):
|
||||
files = {
|
||||
'c:\\fake_src\\out\\Default\\tmp\\swarming_targets': 'unittests\n',
|
||||
'c:\\fake_src\\testing\\buildbot\\gn_isolate_map.pyl': (
|
||||
"{'unittests': {"
|
||||
" 'label': '//somewhere:unittests',"
|
||||
" 'type': 'windowed_test_launcher',"
|
||||
"}}\n"
|
||||
),
|
||||
r'c:\fake_src\out\Default\unittests.exe.runtime_deps': (
|
||||
"unittests.exe\n"
|
||||
"some_dependency\n"
|
||||
),
|
||||
'c:\\fake_src\\out\\Default\\tmp\\swarming_targets':
|
||||
'unittests\n',
|
||||
'c:\\fake_src\\testing\\buildbot\\gn_isolate_map.pyl':
|
||||
("{'unittests': {"
|
||||
" 'label': '//somewhere:unittests',"
|
||||
" 'type': 'windowed_test_launcher',"
|
||||
"}}\n"),
|
||||
r'c:\fake_src\out\Default\unittests.exe.runtime_deps':
|
||||
("unittests.exe\n"
|
||||
"some_dependency\n"),
|
||||
}
|
||||
mbw = self.fake_mbw(files=files, win32=True)
|
||||
self.check(['gen',
|
||||
'-c', 'debug_goma',
|
||||
'--swarming-targets-file',
|
||||
'c:\\fake_src\\out\\Default\\tmp\\swarming_targets',
|
||||
'--isolate-map-file',
|
||||
'c:\\fake_src\\testing\\buildbot\\gn_isolate_map.pyl',
|
||||
'//out/Default'], mbw=mbw, ret=0)
|
||||
self.check([
|
||||
'gen', '-c', 'debug_goma', '--swarming-targets-file',
|
||||
'c:\\fake_src\\out\\Default\\tmp\\swarming_targets',
|
||||
'--isolate-map-file',
|
||||
'c:\\fake_src\\testing\\buildbot\\gn_isolate_map.pyl', '//out/Default'
|
||||
],
|
||||
mbw=mbw,
|
||||
ret=0)
|
||||
|
||||
isolate_file = mbw.files['c:\\fake_src\\out\\Default\\unittests.isolate']
|
||||
isolate_file_contents = ast.literal_eval(isolate_file)
|
||||
@ -661,22 +691,23 @@ class UnitTest(unittest.TestCase):
|
||||
|
||||
def test_gen_console_test_launcher(self):
|
||||
test_files = {
|
||||
'/tmp/swarming_targets': 'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl': (
|
||||
"{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'console_test_launcher',"
|
||||
"}}\n"
|
||||
),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps': (
|
||||
"base_unittests\n"
|
||||
),
|
||||
'/tmp/swarming_targets':
|
||||
'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl':
|
||||
("{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'console_test_launcher',"
|
||||
"}}\n"),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps':
|
||||
("base_unittests\n"),
|
||||
}
|
||||
mbw = self.check(['gen', '-c', 'debug_goma', '//out/Default',
|
||||
'--swarming-targets-file', '/tmp/swarming_targets',
|
||||
'--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'],
|
||||
files=test_files, ret=0)
|
||||
mbw = self.check([
|
||||
'gen', '-c', 'debug_goma', '//out/Default', '--swarming-targets-file',
|
||||
'/tmp/swarming_targets', '--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'
|
||||
],
|
||||
files=test_files,
|
||||
ret=0)
|
||||
|
||||
isolate_file = mbw.files['/fake_src/out/Default/base_unittests.isolate']
|
||||
isolate_file_contents = ast.literal_eval(isolate_file)
|
||||
@ -709,24 +740,25 @@ class UnitTest(unittest.TestCase):
|
||||
|
||||
def test_isolate_test_launcher_with_webcam(self):
|
||||
test_files = {
|
||||
'/tmp/swarming_targets': 'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl': (
|
||||
"{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'console_test_launcher',"
|
||||
" 'use_webcam': True,"
|
||||
"}}\n"
|
||||
),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps': (
|
||||
"base_unittests\n"
|
||||
"some_resource_file\n"
|
||||
),
|
||||
'/tmp/swarming_targets':
|
||||
'base_unittests\n',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl':
|
||||
("{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'console_test_launcher',"
|
||||
" 'use_webcam': True,"
|
||||
"}}\n"),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps':
|
||||
("base_unittests\n"
|
||||
"some_resource_file\n"),
|
||||
}
|
||||
mbw = self.check(['gen', '-c', 'debug_goma', '//out/Default',
|
||||
'--swarming-targets-file', '/tmp/swarming_targets',
|
||||
'--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'],
|
||||
files=test_files, ret=0)
|
||||
mbw = self.check([
|
||||
'gen', '-c', 'debug_goma', '//out/Default', '--swarming-targets-file',
|
||||
'/tmp/swarming_targets', '--isolate-map-file',
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl'
|
||||
],
|
||||
files=test_files,
|
||||
ret=0)
|
||||
|
||||
isolate_file = mbw.files['/fake_src/out/Default/base_unittests.isolate']
|
||||
isolate_file_contents = ast.literal_eval(isolate_file)
|
||||
@ -763,42 +795,44 @@ class UnitTest(unittest.TestCase):
|
||||
|
||||
def test_isolate(self):
|
||||
files = {
|
||||
'/fake_src/out/Default/toolchain.ninja': "",
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl': (
|
||||
"{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'non_parallel_console_test_launcher',"
|
||||
"}}\n"
|
||||
),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps': (
|
||||
"base_unittests\n"
|
||||
),
|
||||
'/fake_src/out/Default/toolchain.ninja':
|
||||
"",
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl':
|
||||
("{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'non_parallel_console_test_launcher',"
|
||||
"}}\n"),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps':
|
||||
("base_unittests\n"),
|
||||
}
|
||||
self.check(['isolate', '-c', 'debug_goma', '//out/Default',
|
||||
'base_unittests'], files=files, ret=0)
|
||||
self.check(
|
||||
['isolate', '-c', 'debug_goma', '//out/Default', 'base_unittests'],
|
||||
files=files,
|
||||
ret=0)
|
||||
|
||||
# test running isolate on an existing build_dir
|
||||
files['/fake_src/out/Default/args.gn'] = 'is_debug = True\n'
|
||||
self.check(['isolate', '//out/Default', 'base_unittests'],
|
||||
files=files, ret=0)
|
||||
files=files,
|
||||
ret=0)
|
||||
files['/fake_src/out/Default/mb_type'] = 'gn\n'
|
||||
self.check(['isolate', '//out/Default', 'base_unittests'],
|
||||
files=files, ret=0)
|
||||
files=files,
|
||||
ret=0)
|
||||
|
||||
def test_run(self):
|
||||
files = {
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl': (
|
||||
"{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'windowed_test_launcher',"
|
||||
"}}\n"
|
||||
),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps': (
|
||||
"base_unittests\n"
|
||||
),
|
||||
'/fake_src/testing/buildbot/gn_isolate_map.pyl':
|
||||
("{'base_unittests': {"
|
||||
" 'label': '//base:base_unittests',"
|
||||
" 'type': 'windowed_test_launcher',"
|
||||
"}}\n"),
|
||||
'/fake_src/out/Default/base_unittests.runtime_deps':
|
||||
("base_unittests\n"),
|
||||
}
|
||||
self.check(['run', '-c', 'debug_goma', '//out/Default',
|
||||
'base_unittests'], files=files, ret=0)
|
||||
self.check(['run', '-c', 'debug_goma', '//out/Default', 'base_unittests'],
|
||||
files=files,
|
||||
ret=0)
|
||||
|
||||
def test_run_swarmed(self):
|
||||
files = {
|
||||
@ -830,25 +864,33 @@ class UnitTest(unittest.TestCase):
|
||||
|
||||
mbw.ToSrcRelPath = to_src_rel_path_stub
|
||||
|
||||
self.check(['run', '-s', '-c', 'debug_goma', '//out/Default',
|
||||
'base_unittests'], mbw=mbw, ret=0)
|
||||
self.check(
|
||||
['run', '-s', '-c', 'debug_goma', '//out/Default', 'base_unittests'],
|
||||
mbw=mbw,
|
||||
ret=0)
|
||||
mbw = self.fake_mbw(files=files)
|
||||
mbw.files[mbw.PathJoin(mbw.TempDir(), 'task.json')] = task_json
|
||||
mbw.files[mbw.PathJoin(mbw.TempDir(), 'collect_output.json')] = collect_json
|
||||
mbw.ToSrcRelPath = to_src_rel_path_stub
|
||||
self.check(['run', '-s', '-c', 'debug_goma', '-d', 'os', 'Win7',
|
||||
'//out/Default', 'base_unittests'], mbw=mbw, ret=0)
|
||||
self.check([
|
||||
'run', '-s', '-c', 'debug_goma', '-d', 'os', 'Win7', '//out/Default',
|
||||
'base_unittests'
|
||||
],
|
||||
mbw=mbw,
|
||||
ret=0)
|
||||
|
||||
def test_lookup(self):
|
||||
self.check(['lookup', '-c', 'debug_goma'], ret=0)
|
||||
|
||||
def test_quiet_lookup(self):
|
||||
self.check(['lookup', '-c', 'debug_goma', '--quiet'], ret=0,
|
||||
self.check(['lookup', '-c', 'debug_goma', '--quiet'],
|
||||
ret=0,
|
||||
out=('is_debug = true\n'
|
||||
'use_goma = true\n'))
|
||||
|
||||
def test_lookup_goma_dir_expansion(self):
|
||||
self.check(['lookup', '-c', 'rel_bot', '-g', '/foo'], ret=0,
|
||||
self.check(['lookup', '-c', 'rel_bot', '-g', '/foo'],
|
||||
ret=0,
|
||||
out=('\n'
|
||||
'Writing """\\\n'
|
||||
'enable_doom_melon = true\n'
|
||||
@ -875,22 +917,33 @@ class UnitTest(unittest.TestCase):
|
||||
self.assertIn('Must specify a build --phase', mbw.out)
|
||||
|
||||
# Check that passing a --phase to a single-phase builder fails.
|
||||
mbw = self.check(['lookup', '-m', 'fake_group', '-b', 'fake_builder',
|
||||
'--phase', 'phase_1'], ret=1)
|
||||
mbw = self.check([
|
||||
'lookup', '-m', 'fake_group', '-b', 'fake_builder', '--phase', 'phase_1'
|
||||
],
|
||||
ret=1)
|
||||
self.assertIn('Must not specify a build --phase', mbw.out)
|
||||
|
||||
# Check that passing a wrong phase key to a multi-phase builder fails.
|
||||
mbw = self.check(['lookup', '-m', 'fake_group', '-b', 'fake_multi_phase',
|
||||
'--phase', 'wrong_phase'], ret=1)
|
||||
mbw = self.check([
|
||||
'lookup', '-m', 'fake_group', '-b', 'fake_multi_phase', '--phase',
|
||||
'wrong_phase'
|
||||
],
|
||||
ret=1)
|
||||
self.assertIn('Phase wrong_phase doesn\'t exist', mbw.out)
|
||||
|
||||
# Check that passing a correct phase key to a multi-phase builder passes.
|
||||
mbw = self.check(['lookup', '-m', 'fake_group', '-b', 'fake_multi_phase',
|
||||
'--phase', 'phase_1'], ret=0)
|
||||
mbw = self.check([
|
||||
'lookup', '-m', 'fake_group', '-b', 'fake_multi_phase', '--phase',
|
||||
'phase_1'
|
||||
],
|
||||
ret=0)
|
||||
self.assertIn('phase = 1', mbw.out)
|
||||
|
||||
mbw = self.check(['lookup', '-m', 'fake_group', '-b', 'fake_multi_phase',
|
||||
'--phase', 'phase_2'], ret=0)
|
||||
mbw = self.check([
|
||||
'lookup', '-m', 'fake_group', '-b', 'fake_multi_phase', '--phase',
|
||||
'phase_2'
|
||||
],
|
||||
ret=0)
|
||||
self.assertIn('phase = 2', mbw.out)
|
||||
|
||||
def test_validate(self):
|
||||
|
||||
Reference in New Issue
Block a user