Begin revising tests

Author: MichaelLeeDBX

test-data/unit/check-incremental.test

@@ -120,7 +120,7 @@ class Parent: pass
 class A(Parent): pass
 
 [rechecked mod1, mod2]
-[stale mod1, mod2]
+[stale mod2]
 [out]
 
 
@@ -142,8 +142,8 @@ def func3() -> None: pass
 [file mod3.py.next]
 def func3() -> int: return 2
 
-[rechecked mod1, mod2, mod3]
-[stale mod1, mod2, mod3]
+[rechecked mod2, mod3]
+[stale mod3]
 [out]
 
 [case testIncrementalInternalFunctionDefinitionChange]
@@ -221,7 +221,7 @@ class Foo:
         return "a"
 
 [rechecked mod1, mod2]
-[stale mod1, mod2]
+[stale mod2]
 [out]
 
 [case testIncrementalBaseClassChange]
@@ -244,7 +244,7 @@ class Bad: pass
 class Child(Bad): pass
 
 [rechecked mod1, mod2]
-[stale mod1, mod2]
+[stale mod2]
 [out]
 main:1: note: In module imported here:
 tmp/mod1.py:2: error: "Child" has no attribute "good_method"
@@ -272,7 +272,7 @@ C = 3
 C = "A"
 
 [rechecked mod1, mod2, mod3, mod4]
-[stale mod1, mod2, mod3, mod4]
+[stale mod2, mod3, mod4]
 [out]
 main:1: note: In module imported here:
 tmp/mod1.py:3: error: Argument 1 to "accepts_int" has incompatible type "str"; expected "int"
@@ -347,12 +347,67 @@ def func2() -> str:
     return "foo"
 
 [rechecked mod1, mod2]
-[stale mod1, mod2]
+[stale mod2]
 [out]
 main:1: note: In module imported here:
 tmp/mod1.py: note: In function "func1":
 tmp/mod1.py:4: error: Incompatible return value type (got "str", expected "int")
 
+[case testIncrementalBadChangeWithSave]
+import mod0
+
+[file mod0.py]
+import mod1
+A = mod1.func2()
+
+[file mod1.py]
+from mod2 import func2
+
+def func1() -> int:
+    return func2()
+
+[file mod2.py]
+def func2() -> int:
+    return 1
+
+[file mod2.py.next]
+def func2() -> str:
+    return "foo"
+
+[rechecked mod0, mod1, mod2]
+[stale mod0, mod2]
+[out]
+tmp/mod0.py:1: note: In module imported here,
+main:1: note: ... from here:
+tmp/mod1.py: note: In function "func1":
+tmp/mod1.py:4: error: Incompatible return value type (got "str", expected "int")
+
+[case testIncrementalOkChangeWithSave]
+import mod0
+
+[file mod0.py]
+import mod1
+A = mod1.func2()
+
+[file mod1.py]
+from mod2 import func2
+
+def func1() -> int:
+    func2()
+    return 1
+
+[file mod2.py]
+def func2() -> int:
+    return 1
+
+[file mod2.py.next]
+def func2() -> str:
+    return "foo"
+
+[rechecked mod0, mod1, mod2]
+[stale mod0, mod2]
+[out]
+
 [case testIncrementalWithComplexDictExpression]
 import mod1 
 
@@ -372,7 +427,7 @@ my_dict = {
 }
 
 [rechecked mod1, mod1_private]
-[stale mod1, mod1_private]
+[stale mod1_private]
 [builtins fixtures/dict.pyi]
 [out]
 
@@ -433,7 +488,7 @@ def some_func(a: int) -> str:
     return "a"
 
 [rechecked mod1, mod1_private]
-[stale mod1, mod1_private]
+[stale mod1_private]
 [builtins fixtures/ops.pyi]
 [out]
 main:1: note: In module imported here:
@@ -471,7 +526,7 @@ def stringify(f: Callable[[int], int]) -> Callable[[int], str]:
 def some_func(a: int) -> int:
     return a + 2
 [rechecked mod1, mod1_private]
-[stale mod1, mod1_private]
+[stale mod1_private]
 [builtins fixtures/ops.pyi]
 [out]
 main:1: note: In module imported here:
@@ -493,7 +548,7 @@ class Foo:
     A = "hello"
 
 [rechecked mod1, mod2]
-[stale mod1, mod2]
+[stale mod2]
 [out]
 
 [case testIncrementalChangingFields]
@@ -504,6 +559,28 @@ import mod2
 f = mod2.Foo()
 f.A
 
+[file mod2.py]
+class Foo:
+    def __init__(self) -> None:
+        self.A = 3
+
+[file mod2.py.next]
+class Foo:
+    def __init__(self) -> None:
+        self.A = "hello"
+
+[rechecked mod1, mod2]
+[stale mod2]
+[out]
+
+[case testIncrementalChangingFieldsWithAssignment]
+import mod1
+
+[file mod1.py]
+import mod2
+f = mod2.Foo()
+B = f.A
+
 [file mod2.py]
 class Foo:
     def __init__(self) -> None:
@@ -538,7 +615,7 @@ class Foo:
         self.A = "hello"
 
 [rechecked mod1, mod2]
-[stale mod1, mod2]
+[stale mod2]
 [out]
 main:1: note: In module imported here:
 tmp/mod1.py:4: error: Argument 1 to "accept_int" has incompatible type "str"; expected "int"
@@ -562,7 +639,7 @@ class Foo:
         attr = "foo"
 
 [rechecked mod1, mod2]
-[stale mod1, mod2]
+[stale mod2]
 [out]
 
 [case testIncrementalSimpleBranchingModules]
@@ -793,14 +870,15 @@ class Class: pass
 
 [builtins fixtures/args.pyi]
 [rechecked collections, main, package.subpackage.mod1]
-[stale collections, main, package.subpackage.mod1]
+[stale collections, package.subpackage.mod1]
 [out]
 tmp/main.py: note: In function "handle":
 tmp/main.py:4: error: "Class" has no attribute "some_attribute"
 
 [case testIncrementalWithIgnores]
 import foo # type: ignore
 
+[builtins fixtures/args.pyi]
 [stale]
 [out]