Merge lp:~al-maisan/bzr-builddeb/missing-tests into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello,

this branch adds a unit and a black-box test for the case where a source upstream branch conflicts with a target packaging branch.

Please take a look.

[James Westby (james-w)]

Looks good.

Thanks,

James

review: Approve

=== modified file 'import_dsc.py'
--- import_dsc.py	2009-08-28 14:12:03 +0000
+++ import_dsc.py	2009-08-28 16:49:59 +0000
@@ -1079,7 +1079,7 @@
         return real_parents
 
     def _fetch_upstream_to_branch(self, revid):
-        """Fetch the revision from the upstream branch in to the pacakging one.
+        """Fetch the revision from the upstream branch in to the packaging one.
         """
         # Make sure we see any revisions added by the upstream branch
         # since self.tree was locked.

=== modified file 'tests/blackbox/__init__.py'
--- tests/blackbox/__init__.py	2008-08-27 11:57:30 +0000
+++ tests/blackbox/__init__.py	2009-08-28 16:39:39 +0000
@@ -27,6 +27,7 @@
           'test_do',
           'test_import_dsc',
           'test_mark_uploaded',
+          'test_merge_package',
           'test_merge_upstream',
           ]
   loader = TestUtil.TestLoader()

=== added file 'tests/blackbox/test_merge_package.py'
--- tests/blackbox/test_merge_package.py	1970-01-01 00:00:00 +0000
+++ tests/blackbox/test_merge_package.py	2009-08-28 16:48:42 +0000
@@ -0,0 +1,207 @@
+#    test_builddeb.py -- Blackbox tests for builddeb.
+#    Copyright (C) 2009 Canonical Ltd.
+#    
+#    This file is part of bzr-builddeb.
+#
+#    bzr-builddeb is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    bzr-builddeb is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with bzr-builddeb; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+import os
+import string
+
+from bzrlib.plugins.builddeb.tests import BuilddebTestCase
+
+
+_Debian_changelog = '''\
+ipsec-tools (%s) unstable; urgency=high
+
+  * debian packaging -- %s
+
+ -- Nico Golde <[e-mail]>  Tue, %02d May 2009 13:26:14 +0200
+
+'''
+
+_Ubuntu_changelog = '''\
+ipsec-tools (%s) karmic; urgency=low
+
+  * ubuntu packaging -- %s
+
+ -- Jamie Strandboge <[e-mail]>  Fri, %02d Jul 2009 13:24:17 -0500
+
+'''
+
+
+def _prepend_log(text, path):
+    content = open(path).read()
+    fh = open(path, 'wb')
+    try:
+        fh.write(text+content)
+    finally:
+        fh.close()
+
+
+class TestMergePackageBB(BuilddebTestCase):
+
+    def test_merge_package_shared_rev_conflict(self):
+        """Source upstream conflicts with target packaging -> Error.
+
+        The debian upstream and the ubuntu packaging branches will differ
+        with respect to the content of the file 'c'.
+
+        The conflict cannot be resolved by fix_ancestry_as_needed().
+        The `SharedUpstreamConflictsWithTargetPackaging` exception is
+        thrown instead.
+        """
+        target, _source = self.make_conflicting_branches_setup()
+        os.chdir('ubup-o')
+        merge_source = '../debp-n'
+        self.run_bzr_error(
+            ['branches for the merge source and target have diverged'],
+            'merge-package %s' % merge_source)
+
+    def make_conflicting_branches_setup(self):
+        """
+        Set up the following test configuration (debian upstream newer).
+
+        debian-upstream                 ,------------------H
+                           A-----------B                    \
+        ubuntu-upstream     \           \`-------G           \
+                             \           \        \           \
+        debian-packaging      \ ,---------D--------\-----------J
+                               C                    \
+        ubuntu-packaging        `----E---------------I
+
+        where:
+           - A = 1.0
+           - B = 1.1
+           - H = 2.0
+
+           - G = 1.1.2
+
+           - C = 1.0-1
+           - D = 1.1-1
+           - J = 2.0-1
+
+           - E = 1.0-1ubuntu1
+           - I = 1.1.2-0ubuntu1
+
+        Please note that the debian upstream and the ubuntu packaging
+        branches will have a conflict with respect to the file 'c'.
+        """
+        # Set up the debian upstream branch.
+        name = 'debu-n'
+        vdata = [
+            ('upstream-1.0', ('a',), None, None),
+            ('upstream-1.1', ('b',), None, None),
+            ('upstream-2.0', ('c',), None, None)]
+        debu_n = self._setup_branch(name, vdata)
+
+        # Set up the debian packaging branch.
+        name = 'debp-n'
+        debp_n = self.make_branch_and_tree(name)
+        debp_n.pull(debu_n.branch, stop_revision=self.revid_debu_n_A)
+
+        vdata = [
+            ('1.0-1', ('debian/', 'debian/changelog'), None, None),
+            ('1.1-1', ('o',), debu_n, self.revid_debu_n_B),
+            ('2.0-1', ('p',), debu_n, self.revid_debu_n_C)]
+        self._setup_branch(name, vdata, debp_n, 'd')
+
+        # Set up the ubuntu upstream branch.
+        name = 'ubuu-o'
+        ubuu_o = debu_n.bzrdir.sprout(
+            name, revision_id=self.revid_debu_n_B).open_workingtree()
+
+        vdata = [('upstream-1.1.2', (), None, None)]
+        self._setup_branch(name, vdata, ubuu_o)
+
+        # Set up the ubuntu packaging branch.
+        name = 'ubup-o'
+        ubup_o = debu_n.bzrdir.sprout(
+            name, revision_id=self.revid_debu_n_A).open_workingtree()
+
+        vdata = [
+            ('1.0-1ubuntu1', (), debp_n, self.revid_debp_n_A),
+            ('1.1.2-0ubuntu1', ('c',), ubuu_o, self.revid_ubuu_o_A)]
+        self._setup_branch(name, vdata, ubup_o, 'u')
+
+        # Return the ubuntu and the debian packaging branches.
+        return (ubup_o, debp_n)
+
+    def _setup_branch(self, name, vdata, tree=None, log_format=None):
+        vids = list(string.ascii_uppercase)
+        days = range(len(string.ascii_uppercase))
+
+        if tree is None:
+            tree = self.make_branch_and_tree(name)
+
+        def revid_name(vid):
+            return 'revid_%s_%s' % (name.replace('-', '_'), vid)
+
+        def add_paths(paths):
+            qpaths = ['%s/%s' % (name, path) for path in paths]
+            self.build_tree(qpaths)
+            tree.add(paths)
+
+        def changelog(vdata, vid):
+            result = ''
+            day = days.pop(0)
+            if isinstance(vdata, tuple):
+                uver, dver = vdata[:2]
+                ucle = _Ubuntu_changelog % (uver, vid, day)
+                dcle = _Debian_changelog % (dver, vid, day)
+                result = ucle + dcle
+            else:
+                if log_format == 'u':
+                    result = _Ubuntu_changelog % (vdata, vid, day)
+                elif log_format == 'd':
+                    result = _Debian_changelog % (vdata, vid, day)
+
+            return result
+
+        def commit(msg, version):
+            vid = vids.pop(0)
+            if log_format is not None:
+                cle = changelog(version, vid)
+                p = '%s/work/%s/debian/changelog' % (self.test_base_dir, name)
+                _prepend_log(cle, p)
+            revid = tree.commit('%s: %s' % (vid, msg))
+            setattr(self, revid_name(vid), revid)
+            tree.branch.tags.set_tag(version, revid)
+
+        def tree_nick(tree):
+            return str(tree)[1:-1].split('/')[-1]
+            
+        tree.lock_write()
+
+        try:
+            for version, paths, utree, urevid in vdata:
+                msg = ''
+                if utree is not None:
+                    tree.merge_from_branch(utree.branch, to_revision=urevid)
+                    utree.branch.tags.merge_to(tree.branch.tags)
+                    if urevid is not None:
+                        msg += 'Merged tree %s|%s. ' % (tree_nick(utree), urevid)
+                    else:
+                        msg += 'Merged tree %s. ' % utree
+                if paths is not None:
+                    add_paths(paths)
+                    msg += 'Added paths: %s. ' % str(paths)
+
+                commit(msg, version)
+        finally:
+            tree.unlock()
+
+        return tree

=== modified file 'tests/test_merge_package.py'
--- tests/test_merge_package.py	2009-08-24 10:47:13 +0000
+++ tests/test_merge_package.py	2009-08-28 16:39:39 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: iso-8859-15 -*-
 #    test_merge_package.py -- Merge packaging branches, fix ancestry as needed.
-#    Copyright (C) 2008 Canonical Ltd.
+#    Copyright (C) 2009 Canonical Ltd.
 #
 #    This file is part of bzr-builddeb.
 #
@@ -28,6 +28,8 @@
 from bzrlib.tests import TestCaseWithTransport
 
 from bzrlib.plugins.builddeb import merge_package as MP
+from bzrlib.plugins.builddeb.errors import (
+    SharedUpstreamConflictsWithTargetPackaging)
 from bzrlib.plugins.builddeb.import_dsc import DistributionBranch
 
 _Debian_changelog = '''\
@@ -161,6 +163,25 @@
         conflict_paths = sorted([c.path for c in ubup.conflicts()])
         self.assertEquals(conflict_paths, [u'debian/changelog'])
 
+    def test_deb_upstream_coflicts_with_ubu_packaging(self):
+        """Source upstream conflicts with target packaging -> exception.
+
+        The debian upstream and the ubuntu packaging branches will differ
+        with respect to the content of the file 'c'.
+
+        The conflict cannot be resolved by fix_ancestry_as_needed().
+        The `SharedUpstreamConflictsWithTargetPackaging` exception is
+        thrown instead.
+        """
+        ubup, debp, ubuu, debu = self._setup_debian_upstream_conflicts()
+
+        e = self.assertRaises(
+            SharedUpstreamConflictsWithTargetPackaging,
+            MP.fix_ancestry_as_needed, ubup, debp.branch)
+
+        conflict_paths = sorted([c.path for c in ubup.conflicts()])
+        self.assertEquals(conflict_paths, [u'c.moved'])
+
     def test_debian_upstream_older(self):
         """Diverging upstreams (debian older) don't cause merge conflicts.
 
@@ -274,8 +295,8 @@
              - E = 1.0-1ubuntu1
              - I = 1.1.2-0ubuntu1
 
-        Please note that the debian and ubuntu branches will have a conflict
-        with respect to the file 'c'.
+        Please note that the debian and ubuntu *upstream* branches will
+        have a conflict with respect to the file 'c'.
         """
         # Set up the debian upstream branch.
         name = 'debu-n'
@@ -322,6 +343,80 @@
         # Return the ubuntu and the debian packaging branches.
         return (ubup_o, debp_n, ubuu_o, debu_n)
 
+    def _setup_debian_upstream_conflicts(self):
+        """
+        Set up the following test configuration (debian upstream newer).
+
+        debian-upstream                 ,------------------H
+                           A-----------B                    \
+        ubuntu-upstream     \           \`-------G           \
+                             \           \        \           \
+        debian-packaging      \ ,---------D--------\-----------J
+                               C                    \
+        ubuntu-packaging        `----E---------------I
+
+        where:
+             - A = 1.0
+             - B = 1.1
+             - H = 2.0
+
+             - G = 1.1.2
+
+             - C = 1.0-1
+             - D = 1.1-1
+             - J = 2.0-1
+
+             - E = 1.0-1ubuntu1
+             - I = 1.1.2-0ubuntu1
+
+        Please note that the debian upstream and the ubuntu packaging
+        branches will have a conflict with respect to the file 'c'.
+        """
+        # Set up the debian upstream branch.
+        name = 'debu-n'
+        vdata = [
+            ('upstream-1.0', ('a',), None, None),
+            ('upstream-1.1', ('b',), None, None),
+            ('upstream-2.0', ('c',), None, None),
+            ]
+        debu_n = self._setup_branch(name, vdata)
+
+        # Set up the debian packaging branch.
+        name = 'debp-n'
+        debp_n = self.make_branch_and_tree(name)
+        debp_n.pull(debu_n.branch, stop_revision=self.revid_debu_n_A)
+
+        vdata = [
+            ('1.0-1', ('debian/', 'debian/changelog'), None, None),
+            ('1.1-1', ('o',), debu_n, self.revid_debu_n_B),
+            ('2.0-1', ('p',), debu_n, self.revid_debu_n_C),
+            ]
+        self._setup_branch(name, vdata, debp_n, 'd')
+
+        # Set up the ubuntu upstream branch.
+        name = 'ubuu-o'
+        ubuu_o = debu_n.bzrdir.sprout(
+            name, revision_id=self.revid_debu_n_B).open_workingtree()
+
+        vdata = [
+            ('upstream-1.1.2', (), None, None),
+            ]
+        self._setup_branch(name, vdata, ubuu_o)
+
+        # Set up the ubuntu packaging branch.
+        name = 'ubup-o'
+        ubup_o = debu_n.bzrdir.sprout(
+            name, revision_id=self.revid_debu_n_A).open_workingtree()
+
+        vdata = [
+            ('1.0-1ubuntu1', (), debp_n, self.revid_debp_n_A),
+            ('1.1.2-0ubuntu1', ('c',), ubuu_o, self.revid_ubuu_o_A),
+            ]
+        self._setup_branch(name, vdata, ubup_o, 'u')
+
+        # Return the ubuntu and the debian packaging branches.
+        return (ubup_o, debp_n, ubuu_o, debu_n)
+
     def _setup_debian_upstream_older(self):
         """
         Set up the following test configuration (debian upstream older).