test: additional housekeeping

Author: kuwv

test/test_commit_gpg.py

@@ -1,4 +1,4 @@
-# Copyright 2010-2021 The pygit2 contributors
+# Copyright 2010-2022 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,
@@ -31,7 +31,8 @@
 author Ben Burkert <[email protected]> 1358451456 -0800
 committer Ben Burkert <[email protected]> 1358451456 -0800
 
-a simple commit which works"""
+a simple commit which works\
+"""
 
 gpgsig = """\
 -----BEGIN PGP SIGNATURE-----
@@ -50,7 +51,8 @@
 7KmTXXQcOVpN6dD3CmRFsbjq+x6RHwa8u1iGn+oIkX908r97ckfB/kHKH7ZdXIJc
 cpxtDQQMGYFpXK/71stq
 =ozeK
------END PGP SIGNATURE-----"""
+-----END PGP SIGNATURE-----\
+"""
 
 gpgsig_content = """\
 tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
@@ -75,8 +77,10 @@
  =ozeK
  -----END PGP SIGNATURE-----
 
-a simple commit which works"""
+a simple commit which works\
+"""
 # NOTE: ^^^ mind the gap (space must exist after GnuPG header) ^^^
+# XXX: seems macos wants the space while linux does not
 
 
 def test_commit_signing(gpgsigned):
@@ -103,36 +107,36 @@ def test_commit_signing(gpgsigned):
     )
     assert commit == content
 
-    # create signed commit
-    signed_oid = repo.create_commit_with_signature(content, gpgsig)
-    signed_commit = repo.get(signed_oid)
+    # create/retrieve signed commit
+    oid = repo.create_commit_with_signature(content, gpgsig)
+    commit = repo.get(oid)
+    signature, payload = commit.gpg_signature
 
-    # verify signed commit
-    signature, payload = signed_commit.gpg_signature
-    assert gpgsig == signature.decode("utf-8")
+    # validate signed commit
     assert content == payload.decode("utf-8")
-    assert signed_commit.read_raw().decode("utf-8") == gpgsig_content
+    assert gpgsig == signature.decode("utf-8")
+    assert gpgsig_content == commit.read_raw().decode("utf-8")
 
     # perform sanity checks
-    assert GIT_OBJ_COMMIT == signed_commit.type
-    assert "6569fdf71dbd99081891154641869c537784a3ba" == signed_commit.hex
-    assert signed_commit.message_encoding is None
-    assert message == signed_commit.message
-    assert 1358451456 == signed_commit.commit_time
-    assert committer == signed_commit.committer
-    assert author == signed_commit.author
-    assert tree == signed_commit.tree.hex
-    assert Oid(hex=tree) == signed_commit.tree_id
-    assert 1 == len(signed_commit.parents)
-    assert parents[0] == signed_commit.parents[0].hex
-    assert Oid(hex=parents[0]) == signed_commit.parent_ids[0]
+    assert GIT_OBJ_COMMIT == commit.type
+    assert "6569fdf71dbd99081891154641869c537784a3ba" == commit.hex
+    assert commit.message_encoding is None
+    assert message == commit.message
+    assert 1358451456 == commit.commit_time
+    assert committer == commit.committer
+    assert author == commit.author
+    assert tree == commit.tree.hex
+    assert Oid(hex=tree) == commit.tree_id
+    assert 1 == len(commit.parents)
+    assert parents[0] == commit.parents[0].hex
+    assert Oid(hex=parents[0]) == commit.parent_ids[0]
 
 
 def test_get_gpg_signature_when_unsigned(gpgsigned):
-    unsigned_hash = "5b5b025afb0b4c913b4c338a42934a3863bf3644"
+    unhash = "5b5b025afb0b4c913b4c338a42934a3863bf3644"
 
     repo = gpgsigned
-    commit = repo.get(unsigned_hash)
+    commit = repo.get(unhash)
     signature, payload = commit.gpg_signature
 
     assert signature is None