Bug 808410 - Ensure retVal is set even when mochitest.cleanup did not generate an exception; r=ahal
authorEd Morley <emorley@mozilla.com>
Tue, 20 Nov 2012 15:24:28 +0000
changeset 113781 5cdd053b27881e2ec35b2ba554511a20e24df31d
parent 113780 470669b03c2f8af132192e39ee976c7f4eefc57e
child 113782 11b11d72993ca1bdde5634eecfade910fc082615
push id23890
push userryanvm@gmail.com
push dateWed, 21 Nov 2012 02:43:32 +0000
treeherdermozilla-central@4f19e7fd8bea [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal
bugs808410
milestone20.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 808410 - Ensure retVal is set even when mochitest.cleanup did not generate an exception; r=ahal
testing/mochitest/runtestsb2g.py
--- a/testing/mochitest/runtestsb2g.py
+++ b/testing/mochitest/runtestsb2g.py
@@ -528,15 +528,15 @@ def main():
         print "Automation Error: Exception caught while running tests"
         traceback.print_exc()
         mochitest.stopWebServer(options)
         mochitest.stopWebSocketServer(options)
         try:
             mochitest.cleanup(None, options)
         except:
             pass
-            sys.exit(1)
+        retVal = 1
 
     sys.exit(retVal)
 
 if __name__ == "__main__":
     main()