New pylint stubbornly wants setUp/tearDown-spanning withs

[git-cache] / test_git_cache.py

diff --git a/test_git_cache.py b/test_git_cache.py
index cc3cf3533715ed16e87198e9fb426215b13e5a7b..529ac94334e97ad9197e6e073f590689f25e7994 100644 (file)
--- a/test_git_cache.py
+++ b/test_git_cache.py
@@ -27,7 +27,7 @@ def _commit_file(
         filename: str,
         contents: str,
         commit_message: str) -> None:
-    with open(os.path.join(directory, filename), 'w') as f:
+    with open(os.path.join(directory, filename), 'w', encoding='utf-8') as f:
         f.write(contents)
     _git(directory, 'add', filename)
     _git(directory, 'commit', '-m', commit_message)
@@ -37,9 +37,9 @@ def _commit_file(
 class TestGitCache(unittest.TestCase):
 
     def setUp(self) -> None:
-        self.xdgcache = tempfile.TemporaryDirectory(
+        self.xdgcache = tempfile.TemporaryDirectory(  # pylint: disable=consider-using-with
             prefix='git_cache_test-cache-')
-        self.xdgdata = tempfile.TemporaryDirectory(
+        self.xdgdata = tempfile.TemporaryDirectory(  # pylint: disable=consider-using-with
             prefix='git_cache_test-data-')
         self.old_XDG_CACHE_HOME = os.environ.get('XDG_CACHE_HOME')
         self.old_XDG_DATA_HOME = os.environ.get('XDG_DATA_HOME')
@@ -54,7 +54,8 @@ class TestGitCache(unittest.TestCase):
         os.environ['BACKOFF_MAX_TIME'] = '0'
         os.environ['FORCE_WARNING_TIME'] = '0'  # ONLY FOR TEST USE!
 
-        self.tempdir = tempfile.TemporaryDirectory(prefix='git_cache_test-')
+        self.tempdir = tempfile.TemporaryDirectory(  # pylint: disable=consider-using-with
+            prefix='git_cache_test-')
         self.upstream = os.path.join(self.tempdir.name, 'upstream')
         subprocess.run(['git', '-c', 'init.defaultBranch=main',
                        'init', self.upstream], check=True)