X-Git-Url: http://git.scottworley.com/git-cache/blobdiff_plain/fc9c09b3cad8def4df7603bfe8a18f9453f911aa..ce9660cb142544ff3612bb2e39e2d2860a72dc5c:/test_git_cache.py?ds=sidebyside

diff --git a/test_git_cache.py b/test_git_cache.py
index ce80fcb..1845c01 100644
--- a/test_git_cache.py
+++ b/test_git_cache.py
@@ -1,3 +1,10 @@
+# git-cache: Cache git content locally
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, version 3.
+
+
 import os.path
 import tempfile
 import shutil
@@ -27,7 +34,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 +44,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 +61,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)
@@ -69,32 +77,32 @@ class TestGitCache(unittest.TestCase):
 
     def test_fetch(self) -> None:
         d, rev = git_cache.fetch(self.upstream, 'main')
-        self.assertEqual(_git(d, 'show', '%s:file' % rev), b'Contents')
+        self.assertEqual(_git(d, 'show', f'{rev}:file'), b'Contents')
 
     def test_fetch_twice(self) -> None:
         d1, rev1 = git_cache.fetch(self.upstream, 'main')
-        self.assertEqual(_git(d1, 'show', '%s:file' % rev1), b'Contents')
+        self.assertEqual(_git(d1, 'show', f'{rev1}:file'), b'Contents')
         d2, rev2 = git_cache.fetch(self.upstream, 'main')
         self.assertEqual(d1, d2)
         self.assertEqual(rev1, rev2)
-        self.assertEqual(_git(d2, 'show', '%s:file' % rev2), b'Contents')
+        self.assertEqual(_git(d2, 'show', f'{rev2}:file'), b'Contents')
 
     def test_fetch_then_ensure(self) -> None:
         d1, rev = git_cache.fetch(self.upstream, 'main')
-        self.assertEqual(_git(d1, 'show', '%s:file' % rev), b'Contents')
+        self.assertEqual(_git(d1, 'show', f'{rev}:file'), b'Contents')
         d2 = git_cache.ensure_rev_available(self.upstream, 'main', rev)
         self.assertEqual(d1, d2)
-        self.assertEqual(_git(d2, 'show', '%s:file' % rev), b'Contents')
+        self.assertEqual(_git(d2, 'show', f'{rev}:file'), b'Contents')
 
     def test_ensure_then_fetch(self) -> None:
         rev1 = _git(
             self.upstream, 'log', '--format=%H', '-n1').strip().decode()
         d1 = git_cache.ensure_rev_available(self.upstream, 'main', rev1)
-        self.assertEqual(_git(d1, 'show', '%s:file' % rev1), b'Contents')
+        self.assertEqual(_git(d1, 'show', f'{rev1}:file'), b'Contents')
         d2, rev2 = git_cache.fetch(self.upstream, 'main')
         self.assertEqual(d1, d2)
         self.assertEqual(rev1, rev2)
-        self.assertEqual(_git(d2, 'show', '%s:file' % rev2), b'Contents')
+        self.assertEqual(_git(d2, 'show', f'{rev2}:file'), b'Contents')
 
     def test_fetch_new_file(self) -> None:
         d1, rev1 = git_cache.fetch(self.upstream, 'main')
@@ -102,7 +110,7 @@ class TestGitCache(unittest.TestCase):
         d2, rev2 = git_cache.fetch(self.upstream, 'main')
         self.assertEqual(d1, d2)
         self.assertNotEqual(rev1, rev2)
-        self.assertEqual(_git(d2, 'show', '%s:foofile' % rev2), b'foo')
+        self.assertEqual(_git(d2, 'show', f'{rev2}:foofile'), b'foo')
 
     def test_ensure_doesnt_fetch_new_file(self) -> None:
         d1, rev1 = git_cache.fetch(self.upstream, 'main')
@@ -113,7 +121,7 @@ class TestGitCache(unittest.TestCase):
         d2 = git_cache.ensure_rev_available(self.upstream, 'main', rev1)
         self.assertEqual(d1, d2)
         p = subprocess.run(
-            ['git', '-C', d2, 'show', '%s:foofile' % rev2], check=False)
+            ['git', '-C', d2, 'show', f'{rev2}:foofile'], check=False)
         self.assertNotEqual(p.returncode, 0)
 
     def test_ensure_doesnt_fetch_from_deleted_upstream(self) -> None:
@@ -130,7 +138,7 @@ class TestGitCache(unittest.TestCase):
         self.assertNotEqual(rev1, rev2)
         d2 = git_cache.ensure_rev_available(self.upstream, 'main', rev2)
         self.assertEqual(d1, d2)
-        self.assertEqual(_git(d2, 'show', '%s:foofile' % rev2), b'foo')
+        self.assertEqual(_git(d2, 'show', f'{rev2}:foofile'), b'foo')
 
     def test_fetch_raises_on_invalid_repo(self) -> None:
         self.tempdir.cleanup()
@@ -171,18 +179,18 @@ class TestGitCache(unittest.TestCase):
         _commit_file(self.upstream, 'foofile', 'foo', 'Foo')
         rev = _git(self.upstream, 'log', '--format=%H', '-n1').strip().decode()
         d = git_cache.ensure_rev_available(self.upstream, 'otherbranch', rev)
-        self.assertEqual(_git(d, 'show', '%s:foofile' % rev), b'foo')
+        self.assertEqual(_git(d, 'show', f'{rev}:foofile'), b'foo')
 
     def test_catch_up(self) -> None:
         _git(self.upstream, 'checkout', '-b', 'otherbranch')
         _commit_file(self.upstream, 'foofile', 'foo', 'Foo')
         rev = _git(self.upstream, 'log', '--format=%H', '-n1').strip().decode()
         d = git_cache.ensure_rev_available(self.upstream, 'otherbranch', rev)
-        self.assertEqual(_git(d, 'show', '%s:foofile' % rev), b'foo')
+        self.assertEqual(_git(d, 'show', f'{rev}:foofile'), b'foo')
         _git(self.upstream, 'checkout', 'main')
         _git(self.upstream, 'merge', '--ff-only', 'otherbranch')
         d = git_cache.ensure_rev_available(self.upstream, 'main', rev)
-        self.assertEqual(_git(d, 'show', '%s:foofile' % rev), b'foo')
+        self.assertEqual(_git(d, 'show', f'{rev}:foofile'), b'foo')
 
     def test_fetch_after_cache_deleted(self) -> None:
         d1, rev1 = git_cache.fetch(self.upstream, 'main')
@@ -190,14 +198,14 @@ class TestGitCache(unittest.TestCase):
         d2, rev2 = git_cache.fetch(self.upstream, 'main')
         self.assertEqual(d1, d2)
         self.assertEqual(rev1, rev2)
-        self.assertEqual(_git(d2, 'show', '%s:file' % rev2), b'Contents')
+        self.assertEqual(_git(d2, 'show', f'{rev2}:file'), b'Contents')
 
     def test_ensure_after_cache_deleted(self) -> None:
         d1, rev = git_cache.fetch(self.upstream, 'main')
         shutil.rmtree(d1)
         d2 = git_cache.ensure_rev_available(self.upstream, 'main', rev)
         self.assertEqual(d1, d2)
-        self.assertEqual(_git(d2, 'show', '%s:file' % rev), b'Contents')
+        self.assertEqual(_git(d2, 'show', f'{rev}:file'), b'Contents')
 
     def test_fetch_raises_on_amend(self) -> None:
         git_cache.fetch(self.upstream, 'main')