← 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: 2014-02-12 18:22:22 UTC
  • mfrom: (6589.2.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20140212182222-beouo25gaf1cny76
(vila) The XDG Base Directory Specification uses the XDG_CACHE_HOME,
 not XDG_CACHE_DIR. (Andrew Starr-Bochicchio)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ancestry.py
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"""