fix

Author: hauntsaninja

mypy/test/testcheck.py

@@ -199,8 +199,6 @@ def run_case_once(
             a = e.messages
             blocker = True
         finally:
-            if res is not None:
-                res.manager.metastore.close()
             assert sys.path[0] == plugin_dir
             del sys.path[0]
 
@@ -233,7 +231,7 @@ def run_case_once(
         assert_string_arrays_equal(output, a, msg.format(testcase.file, testcase.line))
 
         if res:
-            if testcase.writescache:
+            if options.cache_dir != os.devnull:
                 self.verify_cache(module_data, res.manager, blocker, incremental_step)
 
             name = "targets"
@@ -260,6 +258,7 @@ def run_case_once(
                     assert_module_equivalence(
                         "stale" + suffix, expected_stale, res.manager.stale_modules
                     )
+            res.manager.metastore.close()
 
         if testcase.output_files:
             check_test_output_files(testcase, incremental_step, strip_prefix="tmp/")

test-data/unit/check-basic.test

@@ -300,7 +300,7 @@ class C:
 main:2: error: The return type of "__init__" must be None
 
 -- WritesCache signals to testcheck to do the cache validation
-[case testWritesCache]
+[case testWritesCache-writescache]
 import a
 import d
 [file a.py]
@@ -310,7 +310,7 @@ import c
 [file c.py]
 [file d.py]
 
-[case testWritesCacheErrors]
+[case testWritesCacheErrors-writescache]
 import a
 import d
 [file a.py]