Merge lp:~allenap/maas/ucs-execute-bit-bug-1091215 into lp:~maas-committers/maas/trunk

[Gavin Panella]

Ensure that files in the commissioning script archive have the execute bit set.

[Raphaël Badin (rvb)]

review: Approve

[MAAS Lander (maas-lander)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/maas-merger-trunk/150/console reported an error when processing this lp:~allenap/maas/ucs-execute-bit-bug-1091215 branch.
Not merging it.

[Jeroen T. Vermeulen (jtv)]

Remember, in equality tests, we write the expected value first and the actual value second!

[Gavin Panella (allenap)]

> Remember, in equality tests, we write the expected value first and the actual
> value second!

Oops, well spotted.

=== modified file 'src/metadataserver/models/commissioningscript.py'
--- src/metadataserver/models/commissioningscript.py	2012-12-13 09:04:28 +0000
+++ src/metadataserver/models/commissioningscript.py	2012-12-18 12:23:20 +0000
@@ -52,6 +52,7 @@
     assert isinstance(content, bytes), "Script content must be binary."
     tarinfo = tarfile.TarInfo(name=os.path.join(ARCHIVE_PREFIX, name))
     tarinfo.size = len(content)
+    tarinfo.mode = 0755  # u=rwx,go=rx
     tarball.addfile(tarinfo, BytesIO(content))
 
 

=== modified file 'src/metadataserver/tests/test_commissioningscript.py'
--- src/metadataserver/tests/test_commissioningscript.py	2012-12-13 09:17:14 +0000
+++ src/metadataserver/tests/test_commissioningscript.py	2012-12-18 12:23:20 +0000
@@ -78,6 +78,12 @@
         self.assertIn(path, archive.getnames())
         self.assertEqual(content, archive.extractfile(path).read())
 
+    def test_get_archive_sets_sensible_mode(self):
+        for counter in range(3):
+            factory.make_commissioning_script()
+        archive = open_tarfile(CommissioningScript.objects.get_archive())
+        self.assertEqual({0755}, {info.mode for info in archive.getmembers()})
+
 
 class TestCommissioningScript(TestCase):