/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: John Arbash Meinel
  • Date: 2009-08-17 22:11:06 UTC
  • mto: This revision was merged to the branch mainline in revision 4629.
  • Revision ID: john@arbash-meinel.com-20090817221106-snef4s9g2f7zue60
Finish implementation tests.

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 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
51
 
            result = "A1\nB1\nA2\nA3\n"
52
 
            if result != out:
53
 
                result = "A1\nA2\nB1\nA3\n"
54
 
            self.assertEqualDiff(result, out)
 
46
        if result is None:
 
47
            result = "A1\nA2\nB1\nA3\n"
 
48
        self.assertEqualDiff(out, result)
55
49
 
56
50
    def test_ancestry(self):
57
51
        """Tests 'ancestry' command"""