diff options
author | cclauss <cclauss@me.com> | 2019-11-08 20:58:49 +0100 |
---|---|---|
committer | cclauss <cclauss@me.com> | 2019-11-11 10:44:54 +0100 |
commit | e6a58a89cb01aaac668aabf4cab737c6503a27a1 (patch) | |
tree | ed152d5b71de45d9da38070e679ec98439738042 /tools/gyp | |
parent | 8ac771b8093f26ede5426a10ca243eed0d2af2ef (diff) | |
download | android-node-v8-e6a58a89cb01aaac668aabf4cab737c6503a27a1.tar.gz android-node-v8-e6a58a89cb01aaac668aabf4cab737c6503a27a1.tar.bz2 android-node-v8-e6a58a89cb01aaac668aabf4cab737c6503a27a1.zip |
test: fix Python unittests in ./test and ./tools
Co-authored-by: @patrickhousley
Fixes to Python tests to ensure that the following all pass:
1. __python2 -m pytest ./test ./tools__ # 30 tests pass
2. __python3 -m pytest ./test ./tools__ # 30 tests pass
3. __python2 -m unittest discover -s ./test/tools__ # 1 test passes
4. __python3 -m unittest discover -s ./test/tools__ # 1 test passes
5. __PYTHON=python2 make tooltest__ # 1 test passes
6. __PYTHON=python3 make tooltest__ # 1 test passes
This is a subset of #30033
PR-URL: https://github.com/nodejs/node/pull/30340
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Diffstat (limited to 'tools/gyp')
-rwxr-xr-x | tools/gyp/pylib/gyp/MSVSSettings_test.py | 8 | ||||
-rw-r--r-- | tools/gyp/pylib/gyp/common.py | 8 | ||||
-rwxr-xr-x | tools/gyp/pylib/gyp/easy_xml_test.py | 8 | ||||
-rwxr-xr-x | tools/gyp/pylib/gyp/generator/msvs_test.py | 8 | ||||
-rw-r--r-- | tools/gyp/pylib/gyp/generator/ninja_test.py | 7 |
5 files changed, 27 insertions, 12 deletions
diff --git a/tools/gyp/pylib/gyp/MSVSSettings_test.py b/tools/gyp/pylib/gyp/MSVSSettings_test.py index bf6ea6b802..245478c8da 100755 --- a/tools/gyp/pylib/gyp/MSVSSettings_test.py +++ b/tools/gyp/pylib/gyp/MSVSSettings_test.py @@ -6,15 +6,19 @@ """Unit tests for the MSVSSettings.py file.""" -import StringIO import unittest import gyp.MSVSSettings as MSVSSettings +try: + from StringIO import StringIO # Python 2 +except ImportError: + from io import StringIO # Python 3 + class TestSequenceFunctions(unittest.TestCase): def setUp(self): - self.stderr = StringIO.StringIO() + self.stderr = StringIO() def _ExpectedWarnings(self, expected): """Compares recorded lines to expected warnings.""" diff --git a/tools/gyp/pylib/gyp/common.py b/tools/gyp/pylib/gyp/common.py index e5ebcd9c9f..351800ee25 100644 --- a/tools/gyp/pylib/gyp/common.py +++ b/tools/gyp/pylib/gyp/common.py @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import collections import errno import filecmp import os.path @@ -10,6 +9,11 @@ import re import tempfile import sys +try: + from collections.abc import MutableSet +except ImportError: + from collections import MutableSet + # A minimal memoizing decorator. It'll blow up if the args aren't immutable, # among other "problems". @@ -493,7 +497,7 @@ def uniquer(seq, idfun=None): # Based on http://code.activestate.com/recipes/576694/. -class OrderedSet(collections.MutableSet): +class OrderedSet(MutableSet): def __init__(self, iterable=None): self.end = end = [] end += [None, end, end] # sentinel node for doubly linked list diff --git a/tools/gyp/pylib/gyp/easy_xml_test.py b/tools/gyp/pylib/gyp/easy_xml_test.py index df64354982..664b538a58 100755 --- a/tools/gyp/pylib/gyp/easy_xml_test.py +++ b/tools/gyp/pylib/gyp/easy_xml_test.py @@ -8,13 +8,17 @@ import gyp.easy_xml as easy_xml import unittest -import StringIO + +try: + from StringIO import StringIO # Python 2 +except ImportError: + from io import StringIO # Python 3 class TestSequenceFunctions(unittest.TestCase): def setUp(self): - self.stderr = StringIO.StringIO() + self.stderr = StringIO() def test_EasyXml_simple(self): self.assertEqual( diff --git a/tools/gyp/pylib/gyp/generator/msvs_test.py b/tools/gyp/pylib/gyp/generator/msvs_test.py index c0b021df50..1b0cdd1720 100755 --- a/tools/gyp/pylib/gyp/generator/msvs_test.py +++ b/tools/gyp/pylib/gyp/generator/msvs_test.py @@ -7,13 +7,17 @@ import gyp.generator.msvs as msvs import unittest -import StringIO + +try: + from StringIO import StringIO # Python 2 +except ImportError: + from io import StringIO # Python 3 class TestSequenceFunctions(unittest.TestCase): def setUp(self): - self.stderr = StringIO.StringIO() + self.stderr = StringIO() def test_GetLibraries(self): self.assertEqual( diff --git a/tools/gyp/pylib/gyp/generator/ninja_test.py b/tools/gyp/pylib/gyp/generator/ninja_test.py index 1767b2f45a..c8adc251c9 100644 --- a/tools/gyp/pylib/gyp/generator/ninja_test.py +++ b/tools/gyp/pylib/gyp/generator/ninja_test.py @@ -6,11 +6,10 @@ """ Unit tests for the ninja.py file. """ -import gyp.generator.ninja as ninja -import unittest -import StringIO import sys -import TestCommon +import unittest + +import gyp.generator.ninja as ninja class TestPrefixesAndSuffixes(unittest.TestCase): |