From e21f15865cbb011db2a7cc2fde95e8fe149a7041 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Tue, 25 Feb 2014 22:46:10 +0200 Subject: [PATCH] * Thanks for the NMU, Paul. * Non-maintainer upload. * Change debian.tar.gz to debian.tar.xz (Closes: #738413) --- debian/changelog | 13 +++++++++++++ ubuntutools/test/test_archive.py | 18 +++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index d87bfa9..7a7b94e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +ubuntu-dev-tools (0.153) UNRELEASED; urgency=medium + + * Thanks for the NMU, Paul. + + -- Stefano Rivera Tue, 25 Feb 2014 22:45:05 +0200 + +ubuntu-dev-tools (0.152+nmu1) unstable; urgency=medium + + * Non-maintainer upload. + * Change debian.tar.gz to debian.tar.xz (Closes: #738413) + + -- Paul Tagliamonte Mon, 24 Feb 2014 22:34:22 -0500 + ubuntu-dev-tools (0.152) unstable; urgency=medium [ Dimitri John Ledkov ] diff --git a/ubuntutools/test/test_archive.py b/ubuntutools/test/test_archive.py index bb543d4..69ccd9c 100644 --- a/ubuntutools/test/test_archive.py +++ b/ubuntutools/test/test_archive.py @@ -57,7 +57,7 @@ class DscVerificationTestCase(mox.MoxTestBase, unittest.TestCase): self.assertTrue(self.dsc.verify_file( 'test-data/example_1.0.orig.tar.gz')) self.assertTrue(self.dsc.verify_file( - 'test-data/example_1.0-1.debian.tar.gz')) + 'test-data/example_1.0-1.debian.tar.xz')) def test_missing(self): self.assertFalse(self.dsc.verify_file( @@ -151,7 +151,7 @@ class LocalSourcePackageTestCase(mox.MoxTestBase, unittest.TestCase): def test_workdir_srcpkg_noinfo(self): shutil.copy2('test-data/example_1.0-1.dsc', self.workdir) shutil.copy2('test-data/example_1.0.orig.tar.gz', self.workdir) - shutil.copy2('test-data/example_1.0-1.debian.tar.gz', self.workdir) + shutil.copy2('test-data/example_1.0-1.debian.tar.xz', self.workdir) pkg = self.SourcePackage(dscfile=os.path.join(self.workdir, 'example_1.0-1.dsc'), @@ -162,7 +162,7 @@ class LocalSourcePackageTestCase(mox.MoxTestBase, unittest.TestCase): def test_workdir_srcpkg_info(self): shutil.copy2('test-data/example_1.0-1.dsc', self.workdir) shutil.copy2('test-data/example_1.0.orig.tar.gz', self.workdir) - shutil.copy2('test-data/example_1.0-1.debian.tar.gz', self.workdir) + shutil.copy2('test-data/example_1.0-1.debian.tar.xz', self.workdir) pkg = self.SourcePackage('example', '1.0-1', 'main', dscfile=os.path.join(self.workdir, @@ -174,8 +174,8 @@ class LocalSourcePackageTestCase(mox.MoxTestBase, unittest.TestCase): def test_verification(self): shutil.copy2('test-data/example_1.0-1.dsc', self.workdir) shutil.copy2('test-data/example_1.0.orig.tar.gz', self.workdir) - shutil.copy2('test-data/example_1.0-1.debian.tar.gz', self.workdir) - with open(os.path.join(self.workdir, 'example_1.0-1.debian.tar.gz'), + shutil.copy2('test-data/example_1.0-1.debian.tar.xz', self.workdir) + with open(os.path.join(self.workdir, 'example_1.0-1.debian.tar.xz'), 'r+b') as f: f.write('CORRUPTION') @@ -195,7 +195,7 @@ class LocalSourcePackageTestCase(mox.MoxTestBase, unittest.TestCase): url_opener = self.mox.CreateMock(urllib2.OpenerDirector) url_opener.open(mirror + urlbase + 'example_1.0.orig.tar.gz' ).WithSideEffects(self.urlopen_proxy) - url_opener.open(mirror + urlbase + 'example_1.0-1.debian.tar.gz' + url_opener.open(mirror + urlbase + 'example_1.0-1.debian.tar.xz' ).WithSideEffects(self.urlopen_proxy) self.mox.ReplayAll() @@ -219,7 +219,7 @@ class LocalSourcePackageTestCase(mox.MoxTestBase, unittest.TestCase): ).WithSideEffects(self.urlopen_404) url_opener.open(lpbase + 'example_1.0.orig.tar.gz' ).WithSideEffects(self.urlopen_proxy) - url_opener.open(mirror + urlbase + 'example_1.0-1.debian.tar.gz' + url_opener.open(mirror + urlbase + 'example_1.0-1.debian.tar.xz' ).WithSideEffects(self.urlopen_proxy) self.mox.ReplayAll() @@ -273,7 +273,7 @@ class DebianLocalSourcePackageTestCase(LocalSourcePackageTestCase): url_opener.open('http://snapshot.debian.org/file/hashabc' ).WithSideEffects(self.urlopen_file( 'example_1.0.orig.tar.gz')) - url_opener.open(debian_mirror + base + 'example_1.0-1.debian.tar.gz' + url_opener.open(debian_mirror + base + 'example_1.0-1.debian.tar.xz' ).WithSideEffects(self.urlopen_proxy) self.mox.ReplayAll() @@ -297,7 +297,7 @@ class DebianLocalSourcePackageTestCase(LocalSourcePackageTestCase): url_opener = self.mox.CreateMock(urllib2.OpenerDirector) url_opener.open(mirror + base + 'example_1.0.orig.tar.gz' ).WithSideEffects(self.urlopen_proxy) - url_opener.open(mirror + base + 'example_1.0-1.debian.tar.gz' + url_opener.open(mirror + base + 'example_1.0-1.debian.tar.xz' ).WithSideEffects(self.urlopen_proxy) def fake_gpg_info(self, message, keyrings=None):