/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-19 18:04:49 UTC
  • mfrom: (4593.5.43 1.19-known-graph-sorted)
  • Revision ID: pqm@pqm.ubuntu.com-20090819180449-p5dibldf9pcp24n4
(jam) Add VersionedFiles.get_known_graph_ancestry and
        KnownGraph.merge_sort()

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"""