Merge lp:~sil2100/ubuntu-system-image/server-fix-pd-builds into lp:ubuntu-system-image/server

[Łukasz Zemczak]

When generating the ubuntu bits, make sure that all the android touch 'hacks' are also executed for pd. Along with an unit test modification.

When generating the ubuntu bits, make sure that all the android touch 'hacks' are also executed for pd. Along with an unit test modification.

This is required to get the ubuntu-pd images working.

[Barry Warsaw (barry)]

Since it's really not obvious that "pd" == "pocket-desktop", maybe add some comments? Unless the context (which isn't visible in the diff) makes it clear.

One other comment inlined.

Other than that, the diff on the face of it looks okay to me.

review: Approve

[lp:~sil2100/ubuntu-system-image/server-fix-pd-builds]

274. By Łukasz Zemczak on 2015-09-28

Add a comment and do other changes as per Barry's recommendations.

=== modified file 'lib/systemimage/generators.py'
--- lib/systemimage/generators.py	2015-04-10 17:35:24 +0000
+++ lib/systemimage/generators.py	2015-09-28 12:08:22 +0000
@@ -485,7 +485,8 @@
             entry.name = "system/%s" % entry.name
             target_tarball.addfile(entry, fileobj=fileptr)
 
-        if options.get("product", "touch") == "touch":
+        # The touch and pd products are the same
+        if options.get("product", "touch") in ("touch", "pd"):
             # FIXME: Will need to be done on the real rootfs
             # Add some symlinks and directories
             # # /android

=== modified file 'lib/systemimage/tests/test_generators.py'
--- lib/systemimage/tests/test_generators.py	2015-03-31 20:51:38 +0000
+++ lib/systemimage/tests/test_generators.py	2015-09-28 12:08:22 +0000
@@ -441,10 +441,11 @@
                 None)
 
         # Working run
-        for device_arch, cdimage_arch, cdimage_product in (
-                ("generic_x86", "i386", "touch"),
-                ("generic_i386", "i386", "core"),
-                ("generic_amd64", "amd64", "core")):
+        for device_arch, cdimage_arch, cdimage_product, android_hacks in (
+                ("generic_x86", "i386", "touch", True),
+                ("generic_x86", "i386", "pd", True),
+                ("generic_i386", "i386", "core", False),
+                ("generic_amd64", "amd64", "core", False)):
             environment['device_name'] = device_arch
 
             for filename in ("SHA256SUMS",
@@ -507,6 +508,14 @@
                 os.path.join(self.config.publish_path, "pool",
                              "ubuntu-HASH.tar.xz"))
 
+            # Check that for touch and pd the android hacks are executed
+            target_obj = tarfile.open(
+                os.path.join(self.config.publish_path, "pool",
+                             "ubuntu-HASH.tar.xz"), "r:xz")
+            if android_hacks:
+                self.assertIn("system/android", target_obj.getnames())
+            target_obj.close()
+
             for entry in ("ubuntu-HASH.tar.xz", "ubuntu-HASH.tar.xz.asc",
                           "ubuntu-HASH.json", "ubuntu-HASH.json.asc"):
                 os.remove(os.path.join(self.config.publish_path,