~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade_stacked.py

  • Committer: Robert Collins
  • Date: 2009-08-05 02:30:59 UTC
  • mto: This revision was merged to the branch mainline in revision 4593.
  • Revision ID: robertc@robertcollins.net-20090805023059-wkw6m0c9fommcwth
Fix failing tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
 
20
20
from bzrlib import (
21
21
    bzrdir,
 
22
    check,
22
23
    errors,
23
24
    tests,
24
25
    )
56
57
            self.assertRaises(errors.IncompatibleRepositories,
57
58
                stacked.open_branch)
58
59
        else:
59
 
            stacked.open_branch().check()
 
60
            check.check_dwim('stacked', False, True, True)
60
61
        stacked = bzrdir.BzrDir.open('stacked')
61
62
        # but we can upgrade the stacked repository
62
63
        upgrade('stacked', new_format)
63
 
        # and now it's ok
 
64
        # and now it opens ok
64
65
        stacked = bzrdir.BzrDir.open('stacked')
65
 
        stacked.open_branch().check()
 
66
        # And passes check.
 
67
        check.check_dwim('stacked', False, True, True)
66
68
 
67
69
 
68
70
def load_tests(basic_tests, module, loader):