summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudiu Popa <pcmanticore@gmail.com>2018-09-29 16:01:29 +0200
committerClaudiu Popa <pcmanticore@gmail.com>2018-09-29 16:06:13 +0200
commit5d066ed8c8850dcf2a814f849c8b19c1bfd603a1 (patch)
tree4971e92bcf8b09f3fa6e1251f0b4ee7ab6970076
parentcb931bfa8430e6f5b4f51207bbd1b633f3f91e19 (diff)
downloadpylint-git-5d066ed8c8850dcf2a814f849c8b19c1bfd603a1.tar.gz
Move func_block_disable_msg into regrtest_data, because we already have a test for it in unittest_utils
-rw-r--r--pylint/test/a.py1
-rw-r--r--pylint/test/messages/func_block_disable_msg.txt13
-rw-r--r--pylint/test/regrtest_data/func_block_disable_msg.py (renamed from pylint/test/input/func_block_disable_msg.py)0
-rw-r--r--pylint/test/unittest_lint.py3
4 files changed, 2 insertions, 15 deletions
diff --git a/pylint/test/a.py b/pylint/test/a.py
deleted file mode 100644
index 6ca3434f4..000000000
--- a/pylint/test/a.py
+++ /dev/null
@@ -1 +0,0 @@
-"{a[0]}".format(a=object) # [invalid-format-index]
diff --git a/pylint/test/messages/func_block_disable_msg.txt b/pylint/test/messages/func_block_disable_msg.txt
deleted file mode 100644
index 1a16fbed2..000000000
--- a/pylint/test/messages/func_block_disable_msg.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-E: 26:Foo.meth3: Instance of 'Foo' has no 'blop' member
-E: 36:Foo.meth4: Instance of 'Foo' has no 'blip' member
-E: 46:Foo.meth5: Instance of 'Foo' has no 'blip' member
-E: 61:Foo.meth6: Instance of 'Foo' has no 'blip' member
-E: 72:Foo.meth7: Instance of 'Foo' has no 'blip' member
-E: 75:Foo.meth7: Instance of 'Foo' has no 'blip' member
-E: 77:Foo.meth7: Instance of 'Foo' has no 'blip' member
-E: 83:Foo.meth8: Instance of 'Foo' has no 'blip' member
-E:102:Foo.meth9: Instance of 'Foo' has no 'blip' member
-W: 11:Foo.meth1: Unused argument 'arg'
-W:144:ClassLevelMessage.too_complex_but_thats_ok: Else clause on loop without a break statement
-W:150:ClassLevelMessage.too_complex_but_thats_ok: Else clause on loop without a break statement
-W:156:ClassLevelMessage.too_complex_but_thats_ok: Else clause on loop without a break statement
diff --git a/pylint/test/input/func_block_disable_msg.py b/pylint/test/regrtest_data/func_block_disable_msg.py
index 36198db2b..36198db2b 100644
--- a/pylint/test/input/func_block_disable_msg.py
+++ b/pylint/test/regrtest_data/func_block_disable_msg.py
diff --git a/pylint/test/unittest_lint.py b/pylint/test/unittest_lint.py
index 5421d6713..48af48d14 100644
--- a/pylint/test/unittest_lint.py
+++ b/pylint/test/unittest_lint.py
@@ -99,6 +99,7 @@ def remove(file):
HERE = abspath(dirname(__file__))
INPUTDIR = join(HERE, "input")
+REGRTEST_DATA = join(HERE, "regrtest_data")
@contextmanager
@@ -325,7 +326,7 @@ def test_message_state_scope(init_linter):
def test_enable_message_block(init_linter):
linter = init_linter
linter.open()
- filepath = join(INPUTDIR, "func_block_disable_msg.py")
+ filepath = join(REGRTEST_DATA, "func_block_disable_msg.py")
linter.set_current_module("func_block_disable_msg")
astroid = linter.get_ast(filepath, "func_block_disable_msg")
linter.process_tokens(tokenize_module(astroid))