Bug 1032853 - TPS infinitely loops through the same phase of a test. r=ahal a=testonly DONTBUILD
authorHenrik Skupin <mail@hskupin.info>
Wed, 02 Jul 2014 15:37:30 +0200
changeset 191878 424600750c75
parent 191877 e82a9700f94b
child 191879 ef8220857f51
push id27066
push userhskupin@mozilla.com
push dateWed, 02 Jul 2014 13:38:39 +0000
treeherdermozilla-central@424600750c75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal, testonly
bugs1032853
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1032853 - TPS infinitely loops through the same phase of a test. r=ahal a=testonly DONTBUILD --- testing/tps/tps/firefoxrunner.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
testing/tps/tps/firefoxrunner.py
--- a/testing/tps/tps/firefoxrunner.py
+++ b/testing/tps/tps/firefoxrunner.py
@@ -20,17 +20,16 @@ class TPSFirefoxRunner(object):
     def __init__(self, binary):
         if binary is not None and ('http://' in binary or 'ftp://' in binary):
             self.url = binary
             self.binary = None
         else:
             self.url = None
             self.binary = binary
 
-        self.runner = None
         self.installdir = None
 
     def __del__(self):
         if self.installdir:
             mozfile.remove(self.installdir, True)
 
     def download_url(self, url, dest=None):
         h = httplib2.Http()
@@ -73,13 +72,13 @@ 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(profile=self.profile, binary=self.binary, env=env, cmdargs=args)
+        runner = FirefoxRunner(profile=self.profile, binary=self.binary,
+                               env=env, cmdargs=args)
 
-        self.runner.start(timeout=timeout)
-        return self.runner.wait()
+        runner.start(timeout=timeout)
+        return runner.wait()