← 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: Canonical.com Patch Queue Manager
  • Date: 2009-04-11 22:45:46 UTC
  • mfrom: (4286.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090411224546-82f5xlgs2r51k164
(vila)(trivial) Cleanup test imports and use features to better track
        skipped 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
 
46
        if result is None:
51
47
            result = "A1\nB1\nA2\nA3\n"
52
 
            if result != out:
53
 
                result = "A1\nA2\nB1\nA3\n"
54
 
            self.assertEqualDiff(result, out)
 
48
        self.assertEqualDiff(out, result)
55
49
 
56
50
    def test_ancestry(self):
57
51
        """Tests 'ancestry' command"""