From ae389d63e56ffe756e68eafd63ff6f1d137deb66 Mon Sep 17 00:00:00 2001
From: Maico Timmerman <maico.timmerman@gmail.com>
Date: Wed, 5 May 2021 20:20:18 +0200
Subject: [PATCH] mypy: fix working directory for mypy_extra_test_paths.

Change-Id: I55f6b414dd6893590231cc929648db90d3ee4161
---
 test/ext/mypy/test_mypy_plugin_py3k.py | 28 +++++++-------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/test/ext/mypy/test_mypy_plugin_py3k.py b/test/ext/mypy/test_mypy_plugin_py3k.py
index 430a484e3a..da86167462 100644
--- a/test/ext/mypy/test_mypy_plugin_py3k.py
+++ b/test/ext/mypy/test_mypy_plugin_py3k.py
@@ -46,16 +46,7 @@ class MypyPluginTest(fixtures.TestBase):
     def mypy_runner(self, cachedir):
         from mypy import api
 
-        def run(
-            filename, use_plugin=True, incremental=False, working_dir=None
-        ):
-            if working_dir:
-                path = os.path.join(working_dir, filename)
-            else:
-                path = os.path.join(
-                    os.path.dirname(__file__), "files", filename
-                )
-
+        def run(path, use_plugin=True, incremental=False):
             args = [
                 "--strict",
                 "--raise-exceptions",
@@ -124,12 +115,11 @@ class MypyPluginTest(fixtures.TestBase):
                 assert patch_obj.apply(1, dest), (
                     "pathfile %s failed" % patchfile
                 )
-            print("running mypy against %s/mymodel" % cachedir)
+            print("running mypy against %s" % dest)
             result = mypy_runner(
-                "mymodel",
+                dest,
                 use_plugin=True,
                 incremental=True,
-                working_dir=cachedir,
             )
             eq_(
                 result[2],
@@ -151,11 +141,7 @@ class MypyPluginTest(fixtures.TestBase):
             if extra_dir and os.path.isdir(extra_dir):
                 for f in os.listdir(os.path.join(extra_dir, "files")):
                     if f.endswith(".py"):
-                        files.append(
-                            os.path.join(
-                                os.path.dirname(extra_dir), "files", f
-                            )
-                        )
+                        files.append(os.path.join(extra_dir, "files", f))
         return files
 
     @testing.combinations(
@@ -181,10 +167,10 @@ class MypyPluginTest(fixtures.TestBase):
                         (num, is_mypy, expected_msg.strip())
                     )
 
-        result = mypy_runner(filename, use_plugin=use_plugin)
+        result = mypy_runner(path, use_plugin=use_plugin)
 
         if expected_errors:
-            eq_(result[2], 1)
+            eq_(result[2], 1, msg=result)
 
             print(result[0])
 
@@ -209,4 +195,4 @@ class MypyPluginTest(fixtures.TestBase):
             assert not errors, "errors remain: %s" % "\n".join(errors)
 
         else:
-            eq_(result[2], 0, msg=result[0])
+            eq_(result[2], 0, msg=result)
-- 
2.47.3