diff options
| -rw-r--r-- | infra/scripts/legacy/site_config/config.py | 14 | ||||
| -rwxr-xr-x | infra/scripts/runtest_wrapper.py | 9 |
2 files changed, 16 insertions, 7 deletions
diff --git a/infra/scripts/legacy/site_config/config.py b/infra/scripts/legacy/site_config/config.py index 0108e65..7c9ba9a 100644 --- a/infra/scripts/legacy/site_config/config.py +++ b/infra/scripts/legacy/site_config/config.py @@ -6,6 +6,7 @@ """ import os +from twisted.spread import banana # DatabaseSetup was moved. Import it for backward compatibility from common.chromium_utils import DatabaseSetup # pylint: disable=W0611 @@ -14,5 +15,18 @@ from config_bootstrap import Master # pylint: disable=W0403,W0611 SITE_CONFIG_PATH = os.path.abspath(os.path.dirname(__file__)) +# By default, the banana's string size limit is 640kb, which is unsufficient +# when passing diff's around. Raise it to 100megs. Do this here since the limit +# is enforced on both the server and the client so both need to raise the +# limit. +banana.SIZE_LIMIT = 100 * 1024 * 1024 + + def SiteConfigPath(): return SITE_CONFIG_PATH + + + + + + diff --git a/infra/scripts/runtest_wrapper.py b/infra/scripts/runtest_wrapper.py index fe9835f..825a4ab 100755 --- a/infra/scripts/runtest_wrapper.py +++ b/infra/scripts/runtest_wrapper.py @@ -26,17 +26,12 @@ def main(argv): args = parser.parse_args(argv) env = copy.copy(os.environ) - # Reset PYTHONPATH to make sure we're not accidentally using - # the buildbot-provided value and build-side modules. That would make - # changes inside this directory not take effect on buildbot. - pythonpath = [] + pythonpath = env.get('PYTHONPATH', '').split(':') pythonpath.append(os.path.join( SRC_DIR, 'infra', 'scripts', 'legacy', 'scripts')) pythonpath.append(os.path.join( SRC_DIR, 'infra', 'scripts', 'legacy', 'site_config')) - pythonpath.append(os.path.join( - SRC_DIR, 'third_party')) - env['PYTHONPATH'] = os.pathsep.join(pythonpath) + env['PYTHONPATH'] = ':'.join(pythonpath) return subprocess.call([ sys.executable, |