Skip to content
Browse files

Bug 848881 - Report throbberstop - throbberstart instead of total dra…

…wing time, r=mcote.
  • Loading branch information...
1 parent c85dc2a commit c8f55847ce64751a6e49c210020e3acd84aa7111 @bclary bclary committed Mar 7, 2013
Showing with 7 additions and 14 deletions.
  1. +7 −14 tests/s1s2test.py
View
21 tests/s1s2test.py
@@ -58,7 +58,7 @@ def runjob(self, job, worker_subprocess):
# Get results - do this now so we don't have as much to
# parse in logcat.
self.logger.debug('analyzing logcat')
- throbberstart, throbberstop, drawtime = self.analyze_logcat(job)
+ throbberstart, throbberstop = self.analyze_logcat(job)
self.logger.debug('killing fennec')
# Get rid of the browser and session store files
@@ -68,8 +68,6 @@ def runjob(self, job, worker_subprocess):
self.remove_sessionstore_files()
# Ensure we succeeded - no 0's reported
- # - except drawtime, since enddrawing has been missing for
- # some time.
if (throbberstart and
throbberstop and
starttime):
@@ -82,7 +80,6 @@ def runjob(self, job, worker_subprocess):
self.publish_results(starttime=int(starttime),
tstrt=throbberstart,
tstop=throbberstop,
- drawing=drawtime,
job=job,
testname=testname)
@@ -136,25 +133,22 @@ def analyze_logcat(self, job):
buf = [x.strip('\r\n') for x in self.dm.getLogcat()]
throbberstartRE = re.compile('.*Throbber start$')
throbberstopRE = re.compile('.*Throbber stop$')
- endDrawingRE = re.compile('.*endDrawing$')
throbstart = 0
throbstop = 0
- enddraw = 0
for line in buf:
line = line.strip()
- # we want the first throbberstart and throbberstop but the *last*
- # enddrawing
+ # we want the first throbberstart and throbberstop.
if throbberstartRE.match(line) and not throbstart:
throbstart = line.split(' ')[-4]
elif throbberstopRE.match(line) and not throbstop:
throbstop = line.split(' ')[-4]
- elif endDrawingRE.match(line):
- enddraw = line.split(' ')[-3]
- return (int(throbstart), int(throbstop), int(enddraw))
+ if throbstart and throbstop:
+ break
+ return (int(throbstart), int(throbstop))
- def publish_results(self, starttime=0, tstrt=0, tstop=0, drawing=0, job=None, testname = ''):
- msg = 'Start Time: %s Throbber Start: %s Throbber Stop: %s EndDraw: %s' % (starttime, tstrt, tstop, drawing)
+ def publish_results(self, starttime=0, tstrt=0, tstop=0, job=None, testname = ''):
+ msg = 'Start Time: %s Throbber Start: %s Throbber Stop: %s' % (starttime, tstrt, tstop)
print 'RESULTS %s %s:%s' % (self.phone_cfg['phoneid'], datetime.datetime.fromtimestamp(int(job['blddate'])), msg)
self.logger.info('RESULTS: %s:%s' % (self.phone_cfg['phoneid'], msg))
@@ -165,7 +159,6 @@ def publish_results(self, starttime=0, tstrt=0, tstop=0, drawing=0, job=None, te
resultdata['starttime'] = starttime
resultdata['throbberstart'] = tstrt
resultdata['throbberstop'] = tstop
- resultdata['enddrawing'] = drawing
resultdata['blddate'] = job['blddate']
resultdata['revision'] = job['revision']

0 comments on commit c8f5584

Please sign in to comment.
Something went wrong with that request. Please try again.