From 31ad0a0e2588819e791f4269a5d7d7e81a67f8cc Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sun, 21 Aug 2016 09:24:23 +0200 Subject: fix(commit): handle gpgsig properly Assure that gpgsig is not initialized with None to allow the automatic deserialization to kick in. Fixes #500 --- git/test/test_commit.py | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'git/test/test_commit.py') diff --git a/git/test/test_commit.py b/git/test/test_commit.py index ea8cd9af..c0599503 100644 --- a/git/test/test_commit.py +++ b/git/test/test_commit.py @@ -34,6 +34,7 @@ import re import os from datetime import datetime from git.objects.util import tzoffset, utc +from mock import Mock def assert_commit_serialization(rwrepo, commit_id, print_performance_info=False): @@ -342,7 +343,9 @@ JzJMZDRLQLFvnzqZuCjE cstream = BytesIO() cmt._serialize(cstream) assert re.search(r"^gpgsig $", cstream.getvalue().decode('ascii'), re.MULTILINE) - + + self.assert_gpgsig_deserialization(cstream) + cstream.seek(0) cmt.gpgsig = None cmt._deserialize(cstream) @@ -352,6 +355,31 @@ JzJMZDRLQLFvnzqZuCjE cstream = BytesIO() cmt._serialize(cstream) assert not re.search(r"^gpgsig ", cstream.getvalue().decode('ascii'), re.MULTILINE) + + def assert_gpgsig_deserialization(self, cstream): + assert 'gpgsig' in 'precondition: need gpgsig' + + class RepoMock: + def __init__(self, bytestr): + self.bytestr = bytestr + + @property + def odb(self): + class ODBMock: + def __init__(self, bytestr): + self.bytestr = bytestr + + def stream(self, *args): + stream = Mock(spec_set=['read'], return_value=self.bytestr) + stream.read.return_value = self.bytestr + return ('binsha', 'typename', 'size', stream) + + return ODBMock(self.bytestr) + + repo_mock = RepoMock(cstream.getvalue()) + for field in Commit.__slots__: + c = Commit(repo_mock, b'x' * 20) + assert getattr(c, field) is not None def test_datetimes(self): commit = self.rorepo.commit('4251bd5') -- cgit v1.2.1