Bug 1033271 - Backport TPSFirefoxRunner changes from bug 997244 for mozrunner 6.0 r=jgriffin a=testonly DONTBUILD
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 02 Jul 2014 16:06:07 +0200
changeset 228615 4220f0159e89d8cbcfecbe4f15d9ebba1fd89fdd
parent 228614 a6e69640a00bd186337531fd4d6b2c6e0d60fa04
child 228616 5c2c09f3da520e409d08f0f0e423c21d79d8f256
push id6
push userryanvm@gmail.com
push dateMon, 12 Jan 2015 22:04:06 +0000
treeherdermozilla-b2g37_v2_2@895c8fc7b734 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin, testonly
bugs1033271, 997244
milestone32.0a2
Bug 1033271 - Backport TPSFirefoxRunner changes from bug 997244 for mozrunner 6.0 r=jgriffin a=testonly DONTBUILD
testing/tps/tps/firefoxrunner.py
--- a/testing/tps/tps/firefoxrunner.py
+++ b/testing/tps/tps/firefoxrunner.py
@@ -74,22 +74,12 @@ class TPSFirefoxRunner(object):
         if profile is None:
             profile = Profile()
         self.profile = profile
 
         if self.binary is None and self.url:
             self.binary = self.download_build()
 
         if self.runner is None:
-            self.runner = FirefoxRunner(self.profile, binary=self.binary)
-
-        self.runner.profile = self.profile
-
-        if env is not None:
-            self.runner.env.update(env)
+            self.runner = FirefoxRunner(profile=self.profile, binary=self.binary, env=env, cmdargs=args)
 
-        if args is not None:
-            self.runner.cmdargs = copy.copy(args)
-
-        self.runner.start()
-        returncode = self.runner.wait(timeout)
-
-        return returncode
+        self.runner.start(timeout=timeout)
+        return self.runner.wait()