launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/pocket-chroot-gz into lp:launchpad with lp:~cjwatson/launchpad/pocket-chroot-really-pocket as a prerequisite.

Commit message:
Store chroots as .tar.gz, not .tar.bz2.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/pocket-chroot-gz/+merge/361672

The name doesn't actually matter, because launchpad-buildd just lets tar autodetect the compression algorithm, which it does by looking at signatures in the content rather than the file name.  But all current chroots are .tar.gz, and I removed the bzip2-specific optimisation from launchpad-buildd in version 148, so forcing the name to .tar.bz2 is a confusing red herring.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/pocket-chroot-gz into lp:launchpad.

=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjobbehaviour.py'
--- lib/lp/buildmaster/tests/test_buildfarmjobbehaviour.py	2019-01-11 14:10:39 +0000
+++ lib/lp/buildmaster/tests/test_buildfarmjobbehaviour.py	2019-01-11 14:10:39 +0000
@@ -77,7 +77,7 @@
 class FakeDistroArchSeries:
 
     def getChroot(self, pocket=None):
-        return FakeLibraryFileAlias('chroot-fooix-bar-y86.tar.bz2')
+        return FakeLibraryFileAlias('chroot-fooix-bar-y86.tar.gz')
 
 
 class TestBuildFarmJobBehaviourBase(TestCaseWithFactory):
@@ -160,11 +160,11 @@
         # files, and then to start the build.
         expected_calls = [
             ('ensurepresent',
-             'http://librarian.dev/chroot-fooix-bar-y86.tar.bz2', '', ''),
+             'http://librarian.dev/chroot-fooix-bar-y86.tar.gz', '', ''),
             ('ensurepresent', 'http://host/bar.tar', 'admin', 'sekrit'),
             ('ensurepresent', 'http://host/foo.dsc', '', ''),
             ('build', 'PACKAGEBUILD-1', 'foobuild',
-             hashlib.sha1('chroot-fooix-bar-y86.tar.bz2').hexdigest(),
+             hashlib.sha1('chroot-fooix-bar-y86.tar.gz').hexdigest(),
              ['foo.dsc', 'bar.tar'],
              {'archives': ['http://admin:sekrit@blah/'], 'some': 'arg'})]
         self.assertEqual(expected_calls, slave.call_log)

=== modified file 'lib/lp/soyuz/browser/tests/test_distroarchseries_webservice.py'
--- lib/lp/soyuz/browser/tests/test_distroarchseries_webservice.py	2019-01-11 14:10:39 +0000
+++ lib/lp/soyuz/browser/tests/test_distroarchseries_webservice.py	2019-01-11 14:10:39 +0000
@@ -114,7 +114,7 @@
     def test_setChroot_removeChroot(self):
         das = self.factory.makeDistroArchSeries()
         user = das.distroseries.distribution.main_archive.owner
-        expected_file = 'chroot-%s-%s-%s.tar.bz2' % (
+        expected_file = 'chroot-%s-%s-%s.tar.gz' % (
             das.distroseries.distribution.name, das.distroseries.name,
             das.architecturetag)
         webservice = launchpadlib_for("testing", user)

=== modified file 'lib/lp/soyuz/model/distroarchseries.py'
--- lib/lp/soyuz/model/distroarchseries.py	2019-01-11 14:10:39 +0000
+++ lib/lp/soyuz/model/distroarchseries.py	2019-01-11 14:10:39 +0000
@@ -203,7 +203,7 @@
         if content_sha1sum != sha1sum:
             raise InvalidChrootUploaded("Chroot upload checksums do not match")
 
-        filename = 'chroot-%s-%s-%s.tar.bz2' % (
+        filename = 'chroot-%s-%s-%s.tar.gz' % (
             self.distroseries.distribution.name, self.distroseries.name,
             self.architecturetag)
         lfa = getUtility(ILibraryFileAliasSet).create(