Merge lp:~robru/cupstream2distro/fix-ido-tags into lp:cupstream2distro

[Robert Bruce Park]

Fix unhandled exception in find_newest_branch_tag().

Fixes:

https://ci-train.ubuntu.com/job/ubuntu-landing-022-1-build/45/console

  File "/var/lib/citrain/cupstream2distro/branchhandling.py", line 150, in find_newest_branch_tag
    tagname, revno = line.split() or ('', '')
ValueError: too many values to unpack

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:961
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/623/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/623/rebuild

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Looking good, waiting for CI.

review: Approve

=== modified file 'cupstream2distro/branchhandling.py'
--- cupstream2distro/branchhandling.py	2015-03-16 17:35:09 +0000
+++ cupstream2distro/branchhandling.py	2015-03-19 15:49:36 +0000
@@ -147,13 +147,13 @@
         """
         stdout = call('bzr tags --sort=time', cwd=self.path)[1]
         for line in reversed(stdout.split('\n')):
-            tagname, revno = line.split() or ('', '')
+            tagname, div, revno = line.rpartition(' ')
             # revno can be like '?', '1.1.7', or '1', so remove periods or
             # question marks, as those represent non-trunk tags.
             if revno.isdigit():
                 log_value_of.revno('Diffing since')
                 log_value_of.tagname('Diffing since')
-                return tagname
+                return tagname.strip()
 
     def diff_since_newest_branch_tag(self):
         """Return the relevant part of the bzr log since most recent tag."""

=== modified file 'tests/strings.py'
--- tests/strings.py	2015-03-16 02:14:52 +0000
+++ tests/strings.py	2015-03-19 15:49:36 +0000
@@ -162,12 +162,40 @@
 
 TAGLIST = """\
 0.2.0+14.04.20140217.1-0ubuntu1 254
-0.2.0+14.10.20140714.2-0ubuntu1 257
+0.2.0+14.10.20140714.2-0ubuntu1       257
 0.0+r112             7.3.43
 0.0+r116             7.3.46
 0.90.0bzr13.04.05-0ubuntu1 ?
 3.7.0bzr13.04.02-0ubuntu1 ?"""
 
+TAGLIST_IDO = """\
+12.10.0              111
+12.10.1              114
+12.10.2              116
+13.10.0+15.04.20150122-0ubuntu1 188
+13.10.0+15.04.20150130-0ubuntu1        190
+indicator-sound release 0.3.0 ?
+0.3.7                ?
+0.4.8-maverick       ?
+release 2.2 ...      ?
+0.2.8                ?
+0.1~ppa3             ?
+indicator-sound-0.1.2 ?
+indicator-sound-0.1.1 ?
+0.1-0ubuntu1         ?
+release-0.3.2        ?
+0.7.7.0              ?
+indicator-sound 0.1.3 ?
+0.1~ppa4~statusshuffle2 ?
+0.6.4                ?
+0.1~ppa4~statusshuffle1 ?
+0.1~ppa2~indicator9ubuntu5 ?
+0.1~ppa2~indicator9ubuntu8 ?
+Scrub bar fully functional just before maverick UI freeze ?
+indicator-sound release 0.2.1 ?
+0.4.0 release        ?
+"""
+
 LOG_DIFF_AXED = """\
 ------------------------------------------------------------
 revno: 2289 [merge]

=== modified file 'tests/unit/test_branchhandling.py'
--- tests/unit/test_branchhandling.py	2015-03-16 02:14:52 +0000
+++ tests/unit/test_branchhandling.py	2015-03-19 15:49:36 +0000
@@ -95,6 +95,14 @@
             '0.2.0+14.10.20140714.2-0ubuntu1')
 
     @patch('cupstream2distro.branchhandling.call')
+    def test_find_newest_branch_tag_ido(self, call_mock):
+        """Extract the newest tag from a list of tags."""
+        call_mock.return_value = (Mock(returncode=0), s.TAGLIST_IDO, '')
+        self.assertEqual(
+            self.branch.find_newest_branch_tag(),
+            '13.10.0+15.04.20150130-0ubuntu1')
+
+    @patch('cupstream2distro.branchhandling.call')
     def test_find_newest_branch_tag_no_tags(self, call_mock):
         """Return None if no tags found."""
         call_mock.return_value = (Mock(returncode=0), '', '')