Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 12:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 744902 - Update datazilla method names, a=test-only, DONTBUILD because NPOTB

Browse Source
This commit is contained in:
Malini Das 2012-06-11 11:19:43 -07:00
parent 1dae5db5a1
commit 0667a61321
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/marionette/client/marionette/runtests.py
View File

@ -71,7 +71,7 @@ class MarionetteTestResult(unittest._TextTestResult):
for testcase in test._tests: for testcase in test._tests:
if testcase.perfdata: if testcase.perfdata:
if not self.perfdata: if not self.perfdata:
self.perfdata = datazilla.dzResult(testcase.perfdata) self.perfdata = datazilla.DatazillaResult(testcase.perfdata)
else: else:
self.perfdata.join_results(testcase.perfdata) self.perfdata.join_results(testcase.perfdata)
@ -339,7 +339,7 @@ class MarionetteTestRunner(object):
self.logger.info("Using machine_name: %s" % machine_name) self.logger.info("Using machine_name: %s" % machine_name)
os_name = platform.system() os_name = platform.system()
os_version = platform.release() os_version = platform.release()
self.perfrequest = datazilla.dzRequest(server=options.perfserv, machine_name=machine_name, os=os_name, os_version=os_version, self.perfrequest = datazilla.DatazillaRequest(server=options.perfserv, machine_name=machine_name, os=os_name, os_version=os_version,
platform=manifest.get("platform")[0], build_name=manifest.get("build_name")[0], platform=manifest.get("platform")[0], build_name=manifest.get("build_name")[0],
version=manifest.get("version")[0], revision=self.revision, version=manifest.get("version")[0], revision=self.revision,
branch=manifest.get("branch")[0], id=os.getenv('BUILD_ID'), test_date=int(time.time())) branch=manifest.get("branch")[0], id=os.getenv('BUILD_ID'), test_date=int(time.time()))
@ -370,7 +370,7 @@ class MarionetteTestRunner(object):
results = MarionetteTextTestRunner(verbosity=3).run(suite) results = MarionetteTextTestRunner(verbosity=3).run(suite)
self.failed += len(results.failures) + len(results.errors) self.failed += len(results.failures) + len(results.errors)
if results.perfdata: if results.perfdata:
self.perfrequest.add_dzresult(results.perfdata) self.perfrequest.add_datazilla_result(results.perfdata)
if hasattr(results, 'skipped'): if hasattr(results, 'skipped'):
self.todo += len(results.skipped) + len(results.expectedFailures) self.todo += len(results.skipped) + len(results.expectedFailures)
self.passed += results.passed self.passed += results.passed