~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository_reference/test_check.py

  • Committer: John Arbash Meinel
  • Author(s): Mark Hammond
  • Date: 2008-09-09 17:02:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3697.
  • Revision ID: john@arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
An updated transparent icon for bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for check on a repository with external references."""
18
18
 
19
19
import bzrlib.ui
 
20
from bzrlib import errors
20
21
from bzrlib.tests.per_repository_reference import (
21
22
    TestCaseWithExternalReferenceRepository,
22
23
    )
30
31
        tree.add(['file'], ['file-id'])
31
32
        rev1_id = tree.commit('one')
32
33
        referring = self.make_branch_and_tree('referring')
33
 
        readonly_base = self.readonly_repository(tree.branch.repository)
 
34
        readonly_base = self.readonly_repository('base')
34
35
        referring.branch.repository.add_fallback_repository(readonly_base)
35
 
        local_tree = referring.branch.create_checkout('local')
36
 
        self.build_tree_contents([('local/file', 'change')])
37
 
        rev2_id = local_tree.commit('two')
 
36
        self.build_tree_contents([('referring/file', 'change')])
 
37
        rev2_id = referring.commit('two')
38
38
        check_result = referring.branch.repository.check(
39
39
            referring.branch.repository.all_revision_ids())
40
40
        check_result.report_results(verbose=False)
41
 
        self.assertFalse("inconsistent parents" in self.get_log())
 
41
        log = self._get_log(keep_log_file=True)
 
42
        self.assertFalse("inconsistent parents" in log)