summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Sassoulas <pierre.sassoulas@gmail.com>2021-03-09 21:06:36 +0100
committerPierre Sassoulas <pierre.sassoulas@gmail.com>2021-03-14 19:48:30 +0100
commit2311398f99759aa22b225d3f5bc4a901ceba50c3 (patch)
treecec008347e288dfd52dd387395123fcb81830055
parentf9c45916843996b545c954a7ca958133fe7b1e95 (diff)
downloadpylint-git-2311398f99759aa22b225d3f5bc4a901ceba50c3.tar.gz
Migrate func_w0405.py to new functional tests
-rw-r--r--tests/functional/r/reimport.py (renamed from tests/input/func_w0405.py)8
-rw-r--r--tests/functional/r/reimport.txt4
-rw-r--r--tests/functional/r/reimported.py4
-rw-r--r--tests/messages/func_w0405.txt4
-rw-r--r--tests/test_func.py2
5 files changed, 11 insertions, 11 deletions
diff --git a/tests/input/func_w0405.py b/tests/functional/r/reimport.py
index 95c4d134f..defe51959 100644
--- a/tests/input/func_w0405.py
+++ b/tests/functional/r/reimport.py
@@ -5,7 +5,7 @@ from __future__ import absolute_import, print_function
# pylint: disable=using-constant-test,ungrouped-imports,wrong-import-position,import-outside-toplevel
import os
from os.path import join, exists
-import os
+import os # [reimported]
import re as _re
__revision__ = 0
@@ -13,14 +13,14 @@ _re.match('yo', '.*')
if __revision__:
print(os)
- from os.path import exists
+ from os.path import exists # [reimported]
print(join, exists)
def func(yooo):
"""reimport in different scope"""
- import os as ass
+ import os as ass # [reimported]
ass.remove(yooo)
- import re
+ import re # [reimported]
re.compile('.*')
if 1: # pylint: disable=using-constant-test
diff --git a/tests/functional/r/reimport.txt b/tests/functional/r/reimport.txt
new file mode 100644
index 000000000..c57d14817
--- /dev/null
+++ b/tests/functional/r/reimport.txt
@@ -0,0 +1,4 @@
+reimported:8:0::Reimport 'os' (imported line 6)
+reimported:16:4::Reimport 'exists' (imported line 7)
+reimported:21:4:func:Reimport 'os' (imported line 6)
+reimported:23:4:func:Reimport 're' (imported line 9)
diff --git a/tests/functional/r/reimported.py b/tests/functional/r/reimported.py
index 3fe8c901a..03b07c4d6 100644
--- a/tests/functional/r/reimported.py
+++ b/tests/functional/r/reimported.py
@@ -1,7 +1,7 @@
# pylint: disable=missing-docstring,unused-import,import-error, wildcard-import,unused-wildcard-import,redefined-builtin,no-name-in-module,ungrouped-imports,wrong-import-order
-from time import sleep, sleep # [reimported]
-from lala import missing, missing # [reimported]
+from time import sleep, sleep # [reimported]
+from lala import missing, missing # [reimported]
import missing1
import missing1 # [reimported]
diff --git a/tests/messages/func_w0405.txt b/tests/messages/func_w0405.txt
deleted file mode 100644
index 072b15547..000000000
--- a/tests/messages/func_w0405.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-W: 8: Reimport 'os' (imported line 6)
-W: 16: Reimport 'exists' (imported line 7)
-W: 21:func: Reimport 'os' (imported line 6)
-W: 23:func: Reimport 're' (imported line 9)
diff --git a/tests/test_func.py b/tests/test_func.py
index ebcd2b5db..24c8ae6b2 100644
--- a/tests/test_func.py
+++ b/tests/test_func.py
@@ -120,7 +120,7 @@ def gen_tests(filter_rgx):
tests.append((module_file, messages_file, dependencies))
if UPDATE_FILE.exists():
return tests
- assert len(tests) < 16, "Please do not add new test cases here."
+ assert len(tests) < 15, "Please do not add new test cases here."
return tests