New pylint likes f-strings

[git-cache] / test_git_cache.py

diff --git a/test_git_cache.py b/test_git_cache.py
index ce80fcbfaca911589ae13cee4eb61dfb67c30cd1..cc3cf3533715ed16e87198e9fb426215b13e5a7b 100644 (file)
--- a/test_git_cache.py
+++ b/test_git_cache.py
@@ -69,32 +69,32 @@ class TestGitCache(unittest.TestCase):
 
     def test_fetch(self) -> None:
         d, rev = git_cache.fetch(self.upstream, 'main')
 
     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')
 
     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)
         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')
 
     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)
         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)
 
     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)
         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')
 
     def test_fetch_new_file(self) -> None:
         d1, rev1 = git_cache.fetch(self.upstream, 'main')


@@ -102,7 +102,7 @@ class TestGitCache(unittest.TestCase):
         d2, rev2 = git_cache.fetch(self.upstream, 'main')
         self.assertEqual(d1, d2)
         self.assertNotEqual(rev1, rev2)
         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')
 
     def test_ensure_doesnt_fetch_new_file(self) -> None:
         d1, rev1 = git_cache.fetch(self.upstream, 'main')


@@ -113,7 +113,7 @@ class TestGitCache(unittest.TestCase):
         d2 = git_cache.ensure_rev_available(self.upstream, 'main', rev1)
         self.assertEqual(d1, d2)
         p = subprocess.run(
         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:
         self.assertNotEqual(p.returncode, 0)
 
     def test_ensure_doesnt_fetch_from_deleted_upstream(self) -> None:


@@ -130,7 +130,7 @@ class TestGitCache(unittest.TestCase):
         self.assertNotEqual(rev1, rev2)
         d2 = git_cache.ensure_rev_available(self.upstream, 'main', rev2)
         self.assertEqual(d1, d2)
         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()
 
     def test_fetch_raises_on_invalid_repo(self) -> None:
         self.tempdir.cleanup()


@@ -171,18 +171,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)
         _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)
 
     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)
         _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')
 
     def test_fetch_after_cache_deleted(self) -> None:
         d1, rev1 = git_cache.fetch(self.upstream, 'main')


@@ -190,14 +190,14 @@ class TestGitCache(unittest.TestCase):
         d2, rev2 = git_cache.fetch(self.upstream, 'main')
         self.assertEqual(d1, d2)
         self.assertEqual(rev1, rev2)
         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)
 
     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')
 
     def test_fetch_raises_on_amend(self) -> None:
         git_cache.fetch(self.upstream, 'main')