← 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: Ian Clatworthy
  • Date: 2010-02-19 03:02:07 UTC
  • mto: (4797.23.1 integration-2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: ian.clatworthy@canonical.com-20100219030207-zpbzx021zavx4sqt
What's New in 2.1 - a summary of changes since 2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ancestry.py
43
43
 
44
44
    def _check_ancestry(self, location='', result=None):
45
45
        out = self.run_bzr(['ancestry', location])[0]
46
 
        if result is None:
 
46
        if result is not None:
 
47
            self.assertEqualDiff(result, out)
 
48
        else:
 
49
            # A2 and B1 can be in either order, because they are parallel, and
 
50
            # thus their topological order is not defined
47
51
            result = "A1\nB1\nA2\nA3\n"
48
 
        self.assertEqualDiff(out, result)
 
52
            if result != out:
 
53
                result = "A1\nA2\nB1\nA3\n"
 
54
            self.assertEqualDiff(result, out)
49
55
 
50
56
    def test_ancestry(self):
51
57
        """Tests 'ancestry' command"""