← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_join.py

  • Committer: Patch Queue Manager
  • Date: 2016-04-21 04:10:52 UTC
  • mfrom: (6616.1.1 fix-en-user-guide)
  • Revision ID: pqm@pqm.ubuntu.com-20160421041052-clcye7ns1qcl2n7w
(richard-wilbur) Ensure build of English use guide always uses English text
 even when user's locale specifies a different language. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_join.py
18
18
import os
19
19
 
20
20
from bzrlib import (
21
 
    bzrdir,
22
21
    osutils,
23
 
    repository,
24
22
    tests,
25
23
    workingtree,
26
24
    )
30
28
 
31
29
    def make_trees(self):
32
30
        base_tree = self.make_branch_and_tree('tree',
33
 
            format='dirstate-with-subtree')
 
31
            format='development-subtree')
34
32
        base_tree.commit('empty commit')
35
33
        self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
36
34
        sub_tree = self.make_branch_and_tree('tree/subtree')
74
72
        sub_tree.lock_read()
75
73
        self.addCleanup(sub_tree.unlock)
76
74
        self.assertEqual('file1-id', sub_tree.path2id('file1'))
77
 
        self.assertTrue('file1-id' in sub_tree)
 
75
        self.assertTrue(sub_tree.has_id('file1-id'))
78
76
        self.assertEqual('subtree-root-id', sub_tree.path2id(''))
79
77
        self.assertEqual('', sub_tree.id2path('subtree-root-id'))
80
78
        self.assertIs(None, base_tree.path2id('subtree/file1'))
81
79
        base_tree.lock_read()
82
80
        self.addCleanup(base_tree.unlock)
83
 
        self.assertTrue('file1-id' not in base_tree)
 
81
        self.assertFalse(base_tree.has_id('file1-id'))
84
82
        self.assertEqual('subtree-root-id', base_tree.path2id('subtree'))
85
83
        self.assertEqual('subtree', base_tree.id2path('subtree-root-id'))
86
84
 
95
93
                                retcode=3)
96
94
        self.assertContainsRe(err, r"Can't join trees")
97
95
        self.assertContainsRe(err, r"use bzr upgrade")
98
 
 
99