← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_ancestry.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-22 13:22:18 UTC
  • mfrom: (6155.2.2 migrate-config-options)
  • Revision ID: pqm@pqm.ubuntu.com-20110922132218-nitl31j5slbcmnm2
(vila) Migrate dpush_strict,
 push_strict and send_strict options to the stack based config design,
 introducing get_config_stack for branches (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ancestry.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
18
 
19
19
from bzrlib.tests import TestCaseWithTransport
20
 
from bzrlib.workingtree import WorkingTree
21
 
from bzrlib.branch import Branch
22
 
 
23
20
 
24
21
class TestAncestry(TestCaseWithTransport):
25
22
 
43
40
 
44
41
    def _check_ancestry(self, location='', result=None):
45
42
        out = self.run_bzr(['ancestry', location])[0]
46
 
        if result is None:
 
43
        if result is not None:
 
44
            self.assertEqualDiff(result, out)
 
45
        else:
 
46
            # A2 and B1 can be in either order, because they are parallel, and
 
47
            # thus their topological order is not defined
47
48
            result = "A1\nB1\nA2\nA3\n"
48
 
        self.assertEqualDiff(out, result)
 
49
            if result != out:
 
50
                result = "A1\nA2\nB1\nA3\n"
 
51
            self.assertEqualDiff(result, out)
49
52
 
50
53
    def test_ancestry(self):
51
54
        """Tests 'ancestry' command"""