Bug 1397853 - Enable py2 and py3 linter on testing/mochitest. r?ahal
MozReview-Commit-ID: 1mkn2F5xe22
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -69,16 +69,17 @@ from mochitest_options import (
from mozprofile import Profile, Preferences
from mozprofile.permissions import ServerLocations
from urllib import quote_plus as encodeURIComponent
from mozlog.formatters import TbplFormatter
from mozlog import commandline
from mozrunner.utils import get_stack_fixer_function, test_environment
from mozscreenshot import dump_screen
import mozleak
+from six import reraise
HAVE_PSUTIL = False
try:
import psutil
HAVE_PSUTIL = True
except ImportError:
pass
@@ -2241,17 +2242,17 @@ toolbar#nav-bar {
finally:
# cleanup
if os.path.exists(processLog):
os.remove(processLog)
self.urlOpts = []
if marionette_exception is not None:
exc, value, tb = marionette_exception
- raise exc, value, tb
+ reraise(exc, value, tb)
return status, self.lastTestSeen
def initializeLooping(self, options):
"""
This method is used to clear the contents before each run of for loop.
This method is used for --run-by-dir and --bisect-chunk.
"""