Merge lp:~barry/ubuntu-system-image/lp1455119 into lp:ubuntu-system-image/server

[Barry Warsaw]

Ignores redirects in the calculation and generation of alias channels.

(Drive-by fix of obvious typo in copy-image logging.)

[lp:~barry/ubuntu-system-image/lp1455119]

268. By Barry Warsaw on 2015-05-14

Add a unittest for the channel-is-a-redirect-and-alias bug. LP: #1455119

=== modified file 'bin/copy-image'
--- bin/copy-image	2015-04-20 18:33:10 +0000
+++ bin/copy-image	2015-05-14 22:33:40 +0000
@@ -222,7 +222,7 @@
     environment['new_files'] = new_images['full']['files']
 
     logging.info("Generating new version tarball for '%s' (%s)"
-                 % (new_version, "," % environment['version_detail']))
+                 % (new_version, ",".join(environment['version_detail'])))
     version_path = generators.generate_file(conf, "version", [], environment)
     if version_path:
         new_images['full']['files'].append(version_path)

=== modified file 'lib/systemimage/tests/test_tree.py'
--- lib/systemimage/tests/test_tree.py	2015-02-24 18:17:26 +0000
+++ lib/systemimage/tests/test_tree.py	2015-05-14 22:33:40 +0000
@@ -24,6 +24,11 @@
 from systemimage import config, gpg, tree, tools
 from systemimage.testing.helpers import HAS_TEST_KEYS, MISSING_KEYS_WARNING
 
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
+
 
 class TreeTests(unittest.TestCase):
     def setUp(self):
@@ -384,6 +389,29 @@
         self.assertEqual(device.list_images(), target.list_images())
 
     @unittest.skipUnless(HAS_TEST_KEYS, MISSING_KEYS_WARNING)
+    def test_redirect_alias(self):
+        # LP: #1455119 - a channel which is both an alias and a redirect is
+        # culled from sync_aliases().
+        test_tree = tree.Tree(self.config)
+
+        # Create some channels and aliases
+        test_tree.create_channel("parent")
+        test_tree.create_channel("overthere")
+        test_tree.create_channel_redirect("redirect", "overthere")
+
+        # Make the overthere channel both an alias and a redirect
+        with tree.channels_json(test_tree.config,
+                                test_tree.indexpath, True) as channels:
+            channel = channels["overthere"]
+            channel["alias"] = "redirect"
+            channel["redirect"] = "overthere"
+
+        # No sync_alias() call should be made on the this channel.
+        with patch.object(test_tree, 'sync_alias') as mock:
+            test_tree.sync_aliases("redirect")
+        self.assertFalse(mock.called)
+
+    @unittest.skipUnless(HAS_TEST_KEYS, MISSING_KEYS_WARNING)
     def test_rename(self):
         test_tree = tree.Tree(self.config)
 

=== modified file 'lib/systemimage/tree.py'
--- lib/systemimage/tree.py	2015-04-10 17:35:24 +0000
+++ lib/systemimage/tree.py	2015-05-14 22:33:40 +0000
@@ -776,6 +776,7 @@
                           for name, channel
                           in self.list_channels().items()
                           if channel.get("alias", None) == channel_name
+                          and channel.get("redirect", None) is None
                           and name != channel_name]
 
         for alias_name in alias_channels: