Skip to content

Commit 3096a69

Browse files
author
Mihai Alexandru Michis
committedJun 26, 2019
Backed out 5 changesets (bug 1559982, bug 1559975) for cpp unit test failures due to unsupported operand type. CLOSED TREE
Backed out changeset 2309aac6cea3 (bug 1559975) Backed out changeset bf5a6d853abd (bug 1559975) Backed out changeset 0c36f78c971a (bug 1559975) Backed out changeset 0560cf7df7dc (bug 1559975) Backed out changeset 4cb64ca524e7 (bug 1559982)
1 parent 902190d commit 3096a69

File tree

7 files changed

+9
-10
lines changed

7 files changed

+9
-10
lines changed
 

‎testing/firefox-ui/harness/firefox_ui_harness/runners/update.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@ def _run_tests(tags):
105105
# If exceptions happened, re-throw the last one
106106
if self.exc_info:
107107
ex_type, exception, tb = self.exc_info
108-
raise ex_type(exception).with_traceback(tb)
108+
raise ex_type, exception, tb

‎testing/gtest/rungtests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ def main():
210210
options.cwd,
211211
symbols_path=options.symbols_path,
212212
utility_path=options.utility_path)
213-
except Exception as e:
213+
except Exception, e:
214214
log.error(str(e))
215215
result = False
216216
sys.exit(0 if result else 1)

‎testing/remotecppunittests.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# License, v. 2.0. If a copy of the MPL was not distributed with this
55
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

7-
from __future__ import absolute_import, print_function
87
import os
98
import sys
109
import subprocess

‎testing/runcppunittests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# License, v. 2.0. If a copy of the MPL was not distributed with this
55
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

7-
from __future__ import absolute_import, print_function, with_statement
7+
from __future__ import with_statement
88
import sys
99
import os
1010
from optparse import OptionParser

‎tools/lint/py2.yml

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ py2:
3939
- testing/mochitest
4040
- testing/mozharness
4141
- testing/raptor
42+
- testing/remotecppunittests.py
43+
- testing/runcppunittests.py
4244
- testing/runtimes
4345
- testing/tools
4446
- testing/tps

‎tools/lint/py3.yml

+3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ py3:
2525
- security/manager/ssl
2626
- servo
2727
- testing/awsy
28+
- testing/firefox-ui/harness/firefox_ui_harness/runners/update.py
29+
- testing/gtest
2830
- testing/mochitest
2931
- testing/mozharness
3032
- testing/raptor
@@ -35,6 +37,7 @@ py3:
3537
- tools/jprof
3638
- tools/profiler
3739
- tools/rb
40+
- tools/update-packaging
3841
- xpcom/idl-parser
3942
extensions: ['py']
4043
support-files:

‎tools/lint/python/check_compat.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,11 @@ def check_compat_py2(f):
3838
futures = set()
3939
haveprint = False
4040
future_lineno = 1
41-
may_have_relative_imports = False
4241
for node in ast.walk(root):
4342
if isinstance(node, ast.ImportFrom):
4443
if node.module == '__future__':
4544
future_lineno = node.lineno
4645
futures |= set(n.name for n in node.names)
47-
else:
48-
may_have_relative_imports = True
49-
elif isinstance(node, ast.Import):
50-
may_have_relative_imports = True
5146
elif isinstance(node, ast.Print):
5247
haveprint = True
5348

@@ -57,7 +52,7 @@ def check_compat_py2(f):
5752
'column': 1,
5853
}
5954

60-
if 'absolute_import' not in futures and may_have_relative_imports:
55+
if 'absolute_import' not in futures:
6156
err['rule'] = 'require absolute_import'
6257
err['message'] = 'Missing from __future__ import absolute_import'
6358
print(json.dumps(err))

0 commit comments

Comments
 (0)
Failed to load comments.