← 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

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
20
20
"""
21
21
 
22
22
import os
 
23
import sys
23
24
 
24
25
from bzrlib.branch import Branch
25
26
from bzrlib.tests.blackbox import ExternalBase
45
46
        self.runbzr('missing', retcode=3)
46
47
        self.runbzr('missing .')
47
48
        self.runbzr('missing')
48
 
        self.runbzr('pull')
 
49
        if sys.platform not in ('win32', 'cygwin'):
 
50
            # This is equivalent to doing "bzr pull ."
 
51
            # Which means that bzr creates 2 branches grabbing
 
52
            # the same location, and tries to pull.
 
53
            # However, 2 branches mean 2 locks on the same file
 
54
            # which ultimately implies a deadlock.
 
55
            # (non windows platforms allow multiple locks on the
 
56
            # same file by the same calling process)
 
57
            self.runbzr('pull')
49
58
        self.runbzr('pull /', retcode=3)
50
 
        self.runbzr('pull')
 
59
        if sys.platform not in ('win32', 'cygwin'):
 
60
            self.runbzr('pull')
51
61
 
52
62
        os.chdir('..')
53
63
        self.runbzr('branch a b')