summaryrefslogtreecommitdiff
path: root/chromium/v8/tools/testrunner/local
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/v8/tools/testrunner/local')
-rw-r--r--chromium/v8/tools/testrunner/local/statusfile.py5
-rwxr-xr-xchromium/v8/tools/testrunner/local/statusfile_unittest.py11
-rw-r--r--chromium/v8/tools/testrunner/local/testsuite.py2
-rw-r--r--chromium/v8/tools/testrunner/local/utils.py2
4 files changed, 14 insertions, 6 deletions
diff --git a/chromium/v8/tools/testrunner/local/statusfile.py b/chromium/v8/tools/testrunner/local/statusfile.py
index f99941eb991..c8a1b307e41 100644
--- a/chromium/v8/tools/testrunner/local/statusfile.py
+++ b/chromium/v8/tools/testrunner/local/statusfile.py
@@ -27,12 +27,13 @@
# for py2/py3 compatibility
from __future__ import print_function
+from __future__ import absolute_import
import os
import re
-from variants import ALL_VARIANTS
-from utils import Freeze
+from .variants import ALL_VARIANTS
+from .utils import Freeze
# Possible outcomes
FAIL = "FAIL"
diff --git a/chromium/v8/tools/testrunner/local/statusfile_unittest.py b/chromium/v8/tools/testrunner/local/statusfile_unittest.py
index e8d5ff99cd1..3e2493c0ce6 100755
--- a/chromium/v8/tools/testrunner/local/statusfile_unittest.py
+++ b/chromium/v8/tools/testrunner/local/statusfile_unittest.py
@@ -4,10 +4,17 @@
# found in the LICENSE file.
+from __future__ import absolute_import
+import os
+import sys
import unittest
-import statusfile
-from utils import Freeze
+TOOLS_PATH = os.path.dirname(os.path.dirname(os.path.dirname(
+ os.path.abspath(__file__))))
+sys.path.append(TOOLS_PATH)
+
+from testrunner.local import statusfile
+from testrunner.local.utils import Freeze
TEST_VARIABLES = {
diff --git a/chromium/v8/tools/testrunner/local/testsuite.py b/chromium/v8/tools/testrunner/local/testsuite.py
index 864d7346fca..a72ef4be610 100644
--- a/chromium/v8/tools/testrunner/local/testsuite.py
+++ b/chromium/v8/tools/testrunner/local/testsuite.py
@@ -223,7 +223,7 @@ class TestGenerator(object):
return self
def __next__(self):
- return self.next()
+ return next(self)
def next(self):
return next(self._iterator)
diff --git a/chromium/v8/tools/testrunner/local/utils.py b/chromium/v8/tools/testrunner/local/utils.py
index 9128c433a04..b1c3575621c 100644
--- a/chromium/v8/tools/testrunner/local/utils.py
+++ b/chromium/v8/tools/testrunner/local/utils.py
@@ -35,7 +35,7 @@ import os
import platform
import re
import subprocess
-import urllib2
+import urllib
### Exit codes and their meaning.