← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-19 08:31:08 UTC
  • mfrom: (1666.1.5 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060419083108-fab2970f4575b010
Change the default branch format to be metadir. (Robert Collins, Aaron Bentley).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
 
19
 
"""Black-box tests for bzr pull.
20
 
"""
 
19
"""Black-box tests for bzr pull."""
21
20
 
22
21
import os
23
22
import sys
49
48
        self.runbzr('missing', retcode=3)
50
49
        self.runbzr('missing .')
51
50
        self.runbzr('missing')
52
 
        if sys.platform not in ('win32', 'cygwin'):
53
 
            # This is equivalent to doing "bzr pull ."
54
 
            # Which means that bzr creates 2 branches grabbing
55
 
            # the same location, and tries to pull.
56
 
            # However, 2 branches mean 2 locks on the same file
57
 
            # which ultimately implies a deadlock.
58
 
            # (non windows platforms allow multiple locks on the
59
 
            # same file by the same calling process)
60
 
            self.runbzr('pull')
 
51
        # this will work on windows because we check for the same branch
 
52
        # in pull - if it fails, it is a regression
 
53
        self.runbzr('pull')
61
54
        self.runbzr('pull /', retcode=3)
62
55
        if sys.platform not in ('win32', 'cygwin'):
63
56
            self.runbzr('pull')
233
226
        self.build_tree(['branch_a/a'])
234
227
        tree_a.add('a')
235
228
        tree_a.commit('commit a')
236
 
        branch_b = branch_a.bzrdir.sprout('branch_b').open_branch()
237
 
        tree_b = branch_b.bzrdir.open_workingtree()
238
 
        branch_c = branch_a.bzrdir.sprout('branch_c').open_branch()
239
 
        tree_c = branch_c.bzrdir.open_workingtree()
 
229
        tree_b = branch_a.bzrdir.sprout('branch_b').open_workingtree()
 
230
        branch_b = tree_b.branch
 
231
        tree_c = branch_a.bzrdir.sprout('branch_c').open_workingtree()
 
232
        branch_c = tree_c.branch
240
233
        self.build_tree(['branch_a/b'])
241
234
        tree_a.add('b')
242
235
        tree_a.commit('commit b')