Fix test cases

python · JukkaL · Nov 29, 2019 · Nov 29, 2019 · Nov 29, 2019 · Nov 29, 2019
commit eff55056d97450a9477813fb368f2e1eb7a9a376
diff --git a/mypy/errors.py b/mypy/errors.py
@@ -599,13 +599,17 @@ def remove_duplicates(self, errors: List[ErrorTuple]) -> List[ErrorTuple]:
         while i < len(errors):
             dup = False
             j = i - 1
+            conflicts = False
             while (j >= 0 and errors[j][0] == errors[i][0] and
                     errors[j][1] == errors[i][1]):
+                if errors[j][3].startswith('Got:'):
+                    conflicts = True  # Member conflicts reporting
                 if (errors[j][3] == errors[i][3] and
                         # Allow duplicate notes in overload conflicts reporting.
-                        not (errors[i][3] == 'note' and
-                             errors[i][4].strip() in allowed_duplicates
-                             or errors[i][4].strip().startswith('def ')) and
+                        not ((errors[i][3] == 'note' and
+                                 errors[i][4].strip() in allowed_duplicates)
+                             or (errors[i][4].strip().startswith('def ') and
+                                 conflicts)) and
                         errors[j][4] == errors[i][4]):  # ignore column
                     dup = True
                     break

diff --git a/test-data/unit/check-inference.test b/test-data/unit/check-inference.test
@@ -1535,13 +1535,13 @@ def add():
 [case testSpecialCaseEmptyListInitialization]
 def f(blocks: Any): # E: Name 'Any' is not defined \
                     # N: Did you forget to import it from "typing"? (Suggestion: "from typing import Any")
-    to_process = [] # E: Need type annotation for 'to_process' (hint: "to_process: List[<type>] = ...")
+    to_process = []
     to_process = list(blocks)
 [builtins fixtures/list.pyi]
 
 [case testSpecialCaseEmptyListInitialization2]
 def f(blocks: object):
-    to_process = [] # E: Need type annotation for 'to_process' (hint: "to_process: List[<type>] = ...")
+    to_process = []
     to_process = list(blocks) # E: No overload variant of "list" matches argument type "object" \
                               # N: Possible overload variant: \
                               # N:     def [T] __init__(self, x: Iterable[T]) -> List[T] \