Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-10 16:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubuntutools.test.test_archive: Forgive newer python-debian's for calling

Browse Source 
GpgInfo.from_sequence() with the optional keyrings arguments.
This commit is contained in:
Stefano Rivera 2011-08-16 11:19:15 +02:00
parent 0744d360cc
commit abfdd76f01
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -3,11 +3,13 @@ ubuntu-dev-tools (0.128) unstable; urgency=low
[ Stefano Rivera ] [ Stefano Rivera ]
* ubuntutools.builder: Detect missing builder and fail early. * ubuntutools.builder: Detect missing builder and fail early.
* backportpackage: Backport from local source packages again (LP: #801945) * backportpackage: Backport from local source packages again (LP: #801945)
* ubuntutools.test.test_archive: Forgive newer python-debian's for calling
GpgInfo.from_sequence() with the optional keyrings arguments.
[ Julian Taylor ] [ Julian Taylor ]
* lp-shell: use ipython shell if available * lp-shell: use ipython shell if available
-- Stefano Rivera <stefanor@debian.org> Tue, 16 Aug 2011 10:25:24 +0200 -- Stefano Rivera <stefanor@debian.org> Tue, 16 Aug 2011 11:15:18 +0200
ubuntu-dev-tools (0.127) unstable; urgency=low ubuntu-dev-tools (0.127) unstable; urgency=low

29
ubuntutools/test/test_archive.py
View File

@ -21,6 +21,7 @@ import os.path
import shutil import shutil
import StringIO import StringIO
import tempfile import tempfile
import types
import urllib2 import urllib2
import debian.deb822 import debian.deb822
@ -299,11 +300,17 @@ class DebianLocalSourcePackageTestCase(LocalSourcePackageTestCase):
self.mock_opener.open(mirror + base + 'example_1.0-1.debian.tar.gz' self.mock_opener.open(mirror + base + 'example_1.0-1.debian.tar.gz'
).WithSideEffects(self.urlopen_proxy) ).WithSideEffects(self.urlopen_proxy)
self.mox.StubOutWithMock(debian.deb822.GpgInfo, 'from_sequence') def fake_gpg_info(self, message, keyrings=None):
debian.deb822.GpgInfo.from_sequence(mox.IsA(str)).WithSideEffects( return debian.deb822.GpgInfo.from_output(
lambda x: debian.deb822.GpgInfo.from_output(
'[GNUPG:] GOODSIG DEADBEEF Joe Developer ' '[GNUPG:] GOODSIG DEADBEEF Joe Developer '
'<joe@example.net>')) '<joe@example.net>')
# We have to stub this out without mox because there some versions of
# python-debian will pass keyrings=None, others won't.
# http://code.google.com/p/pymox/issues/detail?id=37
self.mox.stubs.Set(debian.deb822.GpgInfo, 'from_sequence',
types.MethodType(fake_gpg_info,
debian.deb822.GpgInfo,
debian.deb822.GpgInfo))
self.mox.ReplayAll() self.mox.ReplayAll()
@ -323,10 +330,16 @@ class DebianLocalSourcePackageTestCase(LocalSourcePackageTestCase):
self.mock_opener.open(mirror + base + 'example_1.0-1.dsc' self.mock_opener.open(mirror + base + 'example_1.0-1.dsc'
).WithSideEffects(self.urlopen_proxy) ).WithSideEffects(self.urlopen_proxy)
self.mox.StubOutWithMock(debian.deb822.GpgInfo, 'from_sequence') def fake_gpg_info(self, message, keyrings=None):
debian.deb822.GpgInfo.from_sequence(mox.IsA(str)).WithSideEffects( return debian.deb822.GpgInfo.from_output(
lambda x: debian.deb822.GpgInfo.from_output( '[GNUPG:] ERRSIG DEADBEEF')
'[GNUPG:] ERRSIG DEADBEEF')) # We have to stub this out without mox because there some versions of
# python-debian will pass keyrings=None, others won't.
# http://code.google.com/p/pymox/issues/detail?id=37
self.mox.stubs.Set(debian.deb822.GpgInfo, 'from_sequence',
types.MethodType(fake_gpg_info,
debian.deb822.GpgInfo,
debian.deb822.GpgInfo))
self.mox.ReplayAll() self.mox.ReplayAll()