ruff check/format in test directory

Author: jdavid

test/test_branch_empty.py

@@ -84,6 +84,7 @@ def test_branches_upstream_name(repo):
 # Low level API written in C, repo.remotes call these.
 #
 
+
 def test_lookup_branch_remote(repo):
     branch = repo.lookup_branch('origin/master', BranchType.REMOTE)
     assert str(branch.target) == ORIGIN_MASTER_COMMIT

test/test_config.py

@@ -155,29 +155,23 @@ def test_multivar():
     config.add_file(CONFIG_FILENAME, 6)
     assert 'this.that' in config
 
-    l = list(config.get_multivar('this.that'))
-    assert ['foobar', 'foobeer'] == l
-    l = list(config.get_multivar('this.that', 'bar'))
-    assert ['foobar'] == l
-
-    l = list(config.get_multivar('this.that', 'foo.*'))
-    assert ['foobar', 'foobeer'] == l
+    assert ['foobar', 'foobeer'] == list(config.get_multivar('this.that'))
+    assert ['foobar'] == list(config.get_multivar('this.that', 'bar'))
+    assert ['foobar', 'foobeer'] == list(config.get_multivar('this.that', 'foo.*'))
 
     config.set_multivar('this.that', '^.*beer', 'fool')
-    l = list(config.get_multivar('this.that', 'fool'))
-    assert ['fool'] == l
+    assert ['fool'] == list(config.get_multivar('this.that', 'fool'))
 
     config.set_multivar('this.that', 'foo.*', 'foo-123456')
-    l = list(config.get_multivar('this.that', 'foo.*'))
-    assert ['foo-123456', 'foo-123456'] == l
+    assert ['foo-123456', 'foo-123456'] == list(
+        config.get_multivar('this.that', 'foo.*')
+    )
 
     config.delete_multivar('this.that', 'bar')
-    l = list(config.get_multivar('this.that', ''))
-    assert ['foo-123456', 'foo-123456'] == l
+    assert ['foo-123456', 'foo-123456'] == list(config.get_multivar('this.that', ''))
 
     config.delete_multivar('this.that', 'foo-[0-9]+')
-    l = list(config.get_multivar('this.that', ''))
-    assert [] == l
+    assert [] == list(config.get_multivar('this.that', ''))
 
 
 def test_iterator(config):

test/test_object.py

@@ -78,8 +78,7 @@ def test_hashing(testrepo):
     assert commit_b in d
     assert d[commit_b]
 
-    l = [commit_a]
-    assert commit_b in l
+    assert commit_b == commit_a
 
 
 def test_peel_commit(testrepo):

test/test_odb_backend.py

@@ -130,8 +130,8 @@ def test_exists(proxy):
     with pytest.raises(TypeError):
         proxy.exists(123)
 
-    assert proxy.exists('1' * 40) == False
-    assert proxy.exists(BLOB_HEX) == True
+    assert not proxy.exists('1' * 40)
+    assert proxy.exists(BLOB_HEX)
 
 
 def test_exists_prefix(proxy):

test/test_remote.py

@@ -139,7 +139,7 @@ def test_refspec(testrepo):
     refspec = remote.get_refspec(0)
     assert refspec.src == REMOTE_FETCHSPEC_SRC
     assert refspec.dst == REMOTE_FETCHSPEC_DST
-    assert True == refspec.force
+    assert refspec.force is True
     assert ORIGIN_REFSPEC == refspec.string
 
     assert list == type(remote.fetch_refspecs)

test/test_repository.py

@@ -829,7 +829,7 @@ def test_worktree_custom_ref(testrepo):
     assert testrepo.list_worktrees() == []
 
     # The ref is no longer checked out
-    assert worktree_ref.is_checked_out() == False
+    assert worktree_ref.is_checked_out() is False
 
     # The branch still exists
     assert branch_name in testrepo.branches

test/test_repository_bare.py

@@ -108,9 +108,8 @@ def test_contains(barerepo):
 
 
 def test_iterable(barerepo):
-    l = [obj for obj in barerepo]
     oid = pygit2.Oid(hex=BLOB_HEX)
-    assert oid in l
+    assert oid in [obj for obj in barerepo]
 
 
 def test_lookup_blob(barerepo):

test/test_status.py

@@ -25,7 +25,6 @@
 
 import pytest
 
-import pygit2
 from pygit2.enums import FileStatus
 
 

test/test_submodule.py

@@ -60,7 +60,7 @@ def test_lookup_submodule_aspath(repo):
 
 def test_lookup_missing_submodule(repo):
     with pytest.raises(KeyError):
-        s = repo.submodules['does-not-exist']
+        repo.submodules['does-not-exist']
     assert repo.submodules.get('does-not-exist') is None
 
 

test/utils.py

@@ -72,12 +72,6 @@
 refcount = pytest.mark.skipif(is_pypy, reason='skip refcounts checks in pypy')
 
 
-def force_rm_handle(remove_path, path, excinfo):
-    path = Path(path)
-    path.chmod(path.stat().st_mode | stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)
-    remove_path(path)
-
-
 def gen_blob_sha1(data):
     # http://stackoverflow.com/questions/552659/assigning-git-sha1s-without-git
     m = hashlib.sha1()
@@ -86,13 +80,18 @@ def gen_blob_sha1(data):
     return m.hexdigest()
 
 
+def force_rm_handle(remove_path, path, excinfo):
+    path = Path(path)
+    path.chmod(path.stat().st_mode | stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)
+    remove_path(path)
+
+
 def rmtree(path):
     """In Windows a read-only file cannot be removed, and shutil.rmtree fails.
     So we implement our own version of rmtree to address this issue.
     """
     if Path(path).exists():
-        onerror = lambda func, path, e: force_rm_handle(func, path, e)
-        shutil.rmtree(path, onerror=onerror)
+        shutil.rmtree(path, onerror=force_rm_handle)
 
 
 class TemporaryRepository: