From 8a369b7876c697bee20c775a80d279545edcb300 Mon Sep 17 00:00:00 2001 From: Rob Sayre Date: Sun, 26 Jun 2011 10:54:57 -0700 Subject: [PATCH 1/3] Add timing information to test harness. --- test/test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/test.py b/test/test.py index 5aece2c24..96aeb5cec 100644 --- a/test/test.py +++ b/test/test.py @@ -415,6 +415,7 @@ def processResults(): def main(): + t1 = time.time() optionParser = TestOptions() options, args = optionParser.parse_args() options = optionParser.verifyOptions(options) @@ -434,6 +435,8 @@ def main(): processResults() finally: teardownBrowsers(browsers) + t2 = time.time() + print "Runtime was", int(t2 - t1), "seconds" if __name__ == '__main__': main() From 9ca7cbdc7388926c9e697dbb71ac4b446acd6de7 Mon Sep 17 00:00:00 2001 From: Rob Sayre Date: Sun, 26 Jun 2011 10:58:41 -0700 Subject: [PATCH 2/3] Check for browsers in verifyOptions, so the script fails early. --- test/test.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/test.py b/test/test.py index 96aeb5cec..b867251ee 100644 --- a/test/test.py +++ b/test/test.py @@ -37,6 +37,8 @@ class TestOptions(OptionParser): options.manifestFile = DEFAULT_MANIFEST_FILE if options.browser and options.browserManifestFile: print "Warning: ignoring browser argument since manifest file was also supplied" + if not options.browser and not options.browserManifestFile: + self.error("No test browsers found. Use --browserManifest or --browser args.") return options def prompt(question): @@ -219,10 +221,9 @@ def setUp(options): if options.browserManifestFile: testBrowsers = makeBrowserCommands(options.browserManifestFile) elif options.browser: - testBrowsers = [BrowserCommand({"path":options.browser, "name":"firefox"})] - else: - print "No test browsers found. Use --browserManifest or --browser args." - + testBrowsers = [BrowserCommand({"path":options.browser, "name":"firefox"})] + assert len(testBrowsers) > 0 + with open(options.manifestFile) as mf: manifestList = json.load(mf) From 6a2e52c8ab704f6d9dbf4775c222bb133675c80b Mon Sep 17 00:00:00 2001 From: Rob Sayre Date: Sun, 26 Jun 2011 11:10:32 -0700 Subject: [PATCH 3/3] Suppress telemetry banner. --- test/resources/firefox/user.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/resources/firefox/user.js b/test/resources/firefox/user.js index b01e2eb76..c92af9167 100644 --- a/test/resources/firefox/user.js +++ b/test/resources/firefox/user.js @@ -34,3 +34,5 @@ user_pref("dom.w3c_touch_events.enabled", true); user_pref("extensions.checkCompatibility", false); user_pref("extensions.installDistroAddons", false); // prevent testpilot etc user_pref("browser.safebrowsing.enable", false); // prevent traffic to google servers +user_pref("toolkit.telemetry.prompted", true); // prevent telemetry banner +user_pref("toolkit.telemetry.enabled", false);