From 1073aa3855ec78056b75923514d59ec9abef1129 Mon Sep 17 00:00:00 2001 From: Rob Wood Date: Fri, 24 Nov 2017 15:00:55 -0500 Subject: [PATCH] Bug 1420070 - Fix talos pageloader manifest bug; r=ahal MozReview-Commit-ID: BewhMkvwufI --HG-- extra : rebase_source : becfa07c03035ae374f498a58c22f13fc9064120 --- testing/talos/talos/run_tests.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/testing/talos/talos/run_tests.py b/testing/talos/talos/run_tests.py index 1c9bd3f11ea3..455db748b485 100755 --- a/testing/talos/talos/run_tests.py +++ b/testing/talos/talos/run_tests.py @@ -54,7 +54,7 @@ def set_tp_preferences(test, browser_config): test[cycle_var] = 2 CLI_bool_options = ['tpchrome', 'tpmozafterpaint', 'tploadnocache', 'tpscrolltest', 'fnbpaint'] - CLI_options = ['tpcycles', 'tppagecycles', 'tptimeout'] + CLI_options = ['tpcycles', 'tppagecycles', 'tptimeout', 'tpmanifest'] for key in CLI_bool_options: if key in test: _pref_name = "talos.%s" % key @@ -82,6 +82,7 @@ def run_tests(config, browser_config): tests = config['tests'] tests = useBaseTestDefaults(config.get('basetest', {}), tests) paths = ['profile_path', 'tpmanifest', 'extensions', 'setup', 'cleanup'] + for test in tests: # Check for profile_path, tpmanifest and interpolate based on Talos # root https://bugzilla.mozilla.org/show_bug.cgi?id=727711 @@ -95,11 +96,6 @@ def run_tests(config, browser_config): '/\\t:\\'))) test['preferences']['talos.tpmanifest'] = test['tpmanifest'] - if not test.get('url'): - # set browser prefs for pageloader test setings (doesn't use cmd line args / url) - test['url'] = None - set_tp_preferences(test, browser_config) - test['setup'] = utils.interpolate(test['setup']) test['cleanup'] = utils.interpolate(test['cleanup']) @@ -227,6 +223,7 @@ def run_tests(config, browser_config): str(scripts_path)) testname = None + # run the tests timer = utils.Timer() LOG.suite_start(tests=[test['name'] for test in tests]) @@ -235,6 +232,11 @@ def run_tests(config, browser_config): testname = test['name'] LOG.test_start(testname) + if not test.get('url'): + # set browser prefs for pageloader test setings (doesn't use cmd line args / url) + test['url'] = None + set_tp_preferences(test, browser_config) + mytest = TTest() # some tests like ts_paint return multiple results in a single iteration