Remove txt file during update for functional test without output

10 files changed, 5 insertions, 18 deletions

diff --git a/tests/functional/a/access/access_attr_before_def_false_positive.txt b/tests/functional/a/access/access_attr_before_def_false_positive.txt
deleted file mode 100644
index c3bcdf8d8..000000000
--- a/tests/functional/a/access/access_attr_before_def_false_positive.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-use-symbolic-message-instead:1:0::"'C0103' is cryptic: use '# pylint: disable=invalid-name' instead"
-use-symbolic-message-instead:1:0::"'R0904' is cryptic: use '# pylint: disable=too-many-public-methods' instead"
-use-symbolic-message-instead:1:0::"'W0201' is cryptic: use '# pylint: disable=attribute-defined-outside-init' instead"
diff --git a/tests/functional/b/base_init_vars.txt b/tests/functional/b/base_init_vars.txt
deleted file mode 100644
index 99d501ae9..000000000
--- a/tests/functional/b/base_init_vars.txt
+++ /dev/null
@@ -1 +0,0 @@
-use-symbolic-message-instead:1:0::"'R0201' is cryptic: use '# pylint: disable=no-self-use' instead"
diff --git a/tests/functional/c/classes_meth_could_be_a_function.txt b/tests/functional/c/classes_meth_could_be_a_function.txt
deleted file mode 100644
index a8a5ea27f..000000000
--- a/tests/functional/c/classes_meth_could_be_a_function.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-use-symbolic-message-instead:1:0::"'C0111' is cryptic: use '# pylint: disable=missing-docstring' instead"
-use-symbolic-message-instead:1:0::"'W0232' is cryptic: use '# pylint: disable=no-init' instead"
-use-symbolic-message-instead:21:0::"'R0201' is cryptic: use '# pylint: disable=no-self-use' instead"
diff --git a/tests/functional/c/control_pragmas.txt b/tests/functional/c/control_pragmas.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/functional/c/control_pragmas.txt
+++ /dev/null
diff --git a/tests/functional/d/decorator_scope.txt b/tests/functional/d/decorator_scope.txt
deleted file mode 100644
index b89662297..000000000
--- a/tests/functional/d/decorator_scope.txt
+++ /dev/null
@@ -1 +0,0 @@
-use-symbolic-message-instead:1:0::"'W0232' is cryptic: use '# pylint: disable=no-init' instead"
diff --git a/tests/functional/e/external_classmethod_crash.txt b/tests/functional/e/external_classmethod_crash.txt
deleted file mode 100644
index e80a3273d..000000000
--- a/tests/functional/e/external_classmethod_crash.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-use-symbolic-message-instead:1:0::"'W0232' is cryptic: use '# pylint: disable=no-init' instead"
-use-symbolic-message-instead:1:0::"'W0613' is cryptic: use '# pylint: disable=unused-argument' instead"
diff --git a/tests/functional/g/genexp_in_class_scope.txt b/tests/functional/g/genexp_in_class_scope.txt
deleted file mode 100644
index b89662297..000000000
--- a/tests/functional/g/genexp_in_class_scope.txt
+++ /dev/null
@@ -1 +0,0 @@
-use-symbolic-message-instead:1:0::"'W0232' is cryptic: use '# pylint: disable=no-init' instead"
diff --git a/tests/functional/i/implicit/implicit_str_concat_multiline.txt b/tests/functional/i/implicit/implicit_str_concat_multiline.txt
index c796269e4..c796269e4 100755..100644
--- a/tests/functional/i/implicit/implicit_str_concat_multiline.txt
+++ b/tests/functional/i/implicit/implicit_str_concat_multiline.txt
diff --git a/tests/functional/i/init_return_from_inner_function.txt b/tests/functional/i/init_return_from_inner_function.txt
deleted file mode 100644
index 448bcc4fb..000000000
--- a/tests/functional/i/init_return_from_inner_function.txt
+++ /dev/null
@@ -1 +0,0 @@
-use-symbolic-message-instead:1:0::Id 'too-few-public-methods' is used to disable 'too-few-public-methods' message emission
diff --git a/tests/test_functional.py b/tests/test_functional.py
index 61ebc47ab..0d015f33e 100644
--- a/tests/test_functional.py
+++ b/tests/test_functional.py
@@ -51,13 +51,12 @@ class LintModuleOutputUpdate(testutils.LintModuleTest):
 
     csv.register_dialect("test", TestDialect)
 
-    def _get_expected(self):
-        with self._open_source_file() as f:
-            expected_msgs = self.get_expected_messages(f)
-        return expected_msgs, []
-
     def _check_output_text(self, _, expected_output, actual_output):
-        if expected_output == actual_output:
+        if expected_output and expected_output == actual_output:
+            return
+        if not expected_output:
+            if os.path.exists(self._test_file.expected_output):
+                os.remove(self._test_file.expected_output)
             return
         with open(self._test_file.expected_output, "w") as f:
             writer = csv.writer(f, dialect="test")