Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8005591

Browse files
committed
[#7021] Added serialization and test from upstream and fixed test issues
1 parent56d7a9b commit8005591

File tree

4 files changed

+78
-1
lines changed

4 files changed

+78
-1
lines changed

‎git/objects/commit.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,11 @@ def _serialize(self, stream):
398398

399399
ifself.encoding!=self.default_encoding:
400400
write("encoding %s\n"%self.encoding)
401+
402+
ifself.gpgsig:
403+
write("gpgsig")
404+
forsiglineinself.gpgsig.rstrip("\n").split("\n"):
405+
write(" "+sigline+"\n")
401406

402407
write("\n")
403408

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
tree cefbccb4843d821183ae195e70a17c9938318945
2+
parent 904435cf76a9bdd5eb41b1c4e049d5a64f3a8400
3+
author Jon Mason <jon.mason@intel.com> 1367013117 -0700
4+
committer Jon Mason <jon.mason@intel.com> 1368640702 -0700
5+
gpgsig -----BEGIN PGP SIGNATURE-----
6+
Version: GnuPG v1.4.11 (GNU/Linux)
7+
8+
iQIcBAABAgAGBQJRk8zMAAoJEG5mS6x6i9IjsTEP/0v2Wx/i7dqyKban6XMIhVdj
9+
uI0DycfXqnCCZmejidzeao+P+cuK/ZAA/b9fU4MtwkDm2USvnIOrB00W0isxsrED
10+
sdv6uJNa2ybGjxBolLrfQcWutxGXLZ1FGRhEvkPTLMHHvVriKoNFXcS7ewxP9MBf
11+
NH97K2wauqA+J4BDLDHQJgADCOmLrGTAU+G1eAXHIschDqa6PZMH5nInetYZONDh
12+
3SkOOv8VKFIF7gu8X7HC+7+Y8k8U0TW0cjlQ2icinwCc+KFoG6GwXS7u/VqIo1Yp
13+
Tack6sxIdK7NXJhV5gAeAOMJBGhO0fHl8UUr96vGEKwtxyZhWf8cuIPOWLk06jA0
14+
g9DpLqmy/pvyRfiPci+24YdYRBua/vta+yo/Lp85N7Hu/cpIh+q5WSLvUlv09Dmo
15+
TTTG8Hf6s3lEej7W8z2xcNZoB6GwXd8buSDU8cu0I6mEO9sNtAuUOHp2dBvTA6cX
16+
PuQW8jg3zofnx7CyNcd3KF3nh2z8mBcDLgh0Q84srZJCPRuxRcp9ylggvAG7iaNd
17+
XMNvSK8IZtWLkx7k3A3QYt1cN4y1zdSHLR2S+BVCEJea1mvUE+jK5wiB9S4XNtKm
18+
BX/otlTa8pNE3fWYBxURvfHnMY4i3HQT7Bc1QjImAhMnyo2vJk4ORBJIZ1FTNIhJ
19+
JzJMZDRLQLFvnzqZuCjE
20+
=przd
21+
-----END PGP SIGNATURE-----
22+
23+
NTB: Multiple NTB client fix
24+
25+
Fix issue with adding multiple ntb client devices to the ntb virtual
26+
bus. Previously, multiple devices would be added with the same name,
27+
resulting in crashes. To get around this issue, add a unique number to
28+
the device when it is added.
29+
30+
Signed-off-by: Jon Mason <jon.mason@intel.com>

‎git/test/lib/helper.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ class TestBase(TestCase):
227227
"""
228228

229229
@classmethod
230-
defsetUpAll(cls):
230+
defsetUpClass(cls):
231231
"""
232232
Dynamically add a read-only repository to our actual type. This way
233233
each test type has its own repository

‎git/test/test_commit.py‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
fromcStringIOimportStringIO
1414
importtime
1515
importsys
16+
importre
1617

1718

1819
defassert_commit_serialization(rwrepo,commit_id,print_performance_info=False):
@@ -273,3 +274,44 @@ def test_serialization_unicode_support(self):
273274
# it appears
274275
cmt.author.__repr__()
275276

277+
deftest_gpgsig(self):
278+
cmt=self.rorepo.commit()
279+
cmt._deserialize(open(fixture_path('commit_with_gpgsig')))
280+
281+
fixture_sig="""-----BEGIN PGP SIGNATURE-----
282+
Version: GnuPG v1.4.11 (GNU/Linux)
283+
284+
iQIcBAABAgAGBQJRk8zMAAoJEG5mS6x6i9IjsTEP/0v2Wx/i7dqyKban6XMIhVdj
285+
uI0DycfXqnCCZmejidzeao+P+cuK/ZAA/b9fU4MtwkDm2USvnIOrB00W0isxsrED
286+
sdv6uJNa2ybGjxBolLrfQcWutxGXLZ1FGRhEvkPTLMHHvVriKoNFXcS7ewxP9MBf
287+
NH97K2wauqA+J4BDLDHQJgADCOmLrGTAU+G1eAXHIschDqa6PZMH5nInetYZONDh
288+
3SkOOv8VKFIF7gu8X7HC+7+Y8k8U0TW0cjlQ2icinwCc+KFoG6GwXS7u/VqIo1Yp
289+
Tack6sxIdK7NXJhV5gAeAOMJBGhO0fHl8UUr96vGEKwtxyZhWf8cuIPOWLk06jA0
290+
g9DpLqmy/pvyRfiPci+24YdYRBua/vta+yo/Lp85N7Hu/cpIh+q5WSLvUlv09Dmo
291+
TTTG8Hf6s3lEej7W8z2xcNZoB6GwXd8buSDU8cu0I6mEO9sNtAuUOHp2dBvTA6cX
292+
PuQW8jg3zofnx7CyNcd3KF3nh2z8mBcDLgh0Q84srZJCPRuxRcp9ylggvAG7iaNd
293+
XMNvSK8IZtWLkx7k3A3QYt1cN4y1zdSHLR2S+BVCEJea1mvUE+jK5wiB9S4XNtKm
294+
BX/otlTa8pNE3fWYBxURvfHnMY4i3HQT7Bc1QjImAhMnyo2vJk4ORBJIZ1FTNIhJ
295+
JzJMZDRLQLFvnzqZuCjE
296+
=przd
297+
-----END PGP SIGNATURE-----"""
298+
self.assertEqual(cmt.gpgsig,fixture_sig)
299+
self.assertIn('NTB: Multiple NTB client fix',cmt.message)
300+
cmt.gpgsig="<test\ndummy\nsig>"
301+
self.assertNotEqual(cmt.gpgsig,fixture_sig)
302+
303+
cstream=StringIO()
304+
cmt._serialize(cstream)
305+
value=cstream.getvalue()
306+
self.assertRegexpMatches(value,re.compile(r"^gpgsig <test\n dummy\n sig>$",re.MULTILINE))
307+
308+
cstream.seek(0)
309+
cmt.gpgsig=None
310+
cmt._deserialize(cstream)
311+
self.assertEqual(cmt.gpgsig,"<test\ndummy\nsig>")
312+
313+
cmt.gpgsig=None
314+
cstream=StringIO()
315+
cmt._serialize(cstream)
316+
value=cstream.getvalue()
317+
self.assertNotRegexpMatches(value,re.compile(r"^gpgsig ",re.MULTILINE))

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp