← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branch.py
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for the Branch facility that are not interface  tests.
18
18
 
43
43
    PullResult,
44
44
    _run_with_write_locked_target,
45
45
    )
46
 
from bzrlib.bzrdir import (BzrDirMetaFormat1, BzrDirMeta1, 
 
46
from bzrlib.bzrdir import (BzrDirMetaFormat1, BzrDirMeta1,
47
47
                           BzrDir, BzrDirFormat)
48
48
from bzrlib.errors import (NotBranchError,
49
49
                           UnknownFormatError,
64
64
 
65
65
    def test_default_format_is_same_as_bzrdir_default(self):
66
66
        # XXX: it might be nice if there was only one place the default was
67
 
        # set, but at the moment that's not true -- mbp 20070814 -- 
 
67
        # set, but at the moment that's not true -- mbp 20070814 --
68
68
        # https://bugs.launchpad.net/bzr/+bug/132376
69
69
        self.assertEqual(BranchFormat.get_default_format(),
70
70
                BzrDirFormat.get_default_format().get_branch_format())
134
134
class SampleBranchFormat(BranchFormat):
135
135
    """A sample format
136
136
 
137
 
    this format is initializable, unsupported to aid in testing the 
 
137
    this format is initializable, unsupported to aid in testing the
138
138
    open and open_downlevel routines.
139
139
    """
140
140
 
151
151
    def is_supported(self):
152
152
        return False
153
153
 
154
 
    def open(self, transport, _found=False):
 
154
    def open(self, transport, _found=False, ignore_fallbacks=False):
155
155
        return "opened branch."
156
156
 
157
157
 
161
161
    def test_find_format(self):
162
162
        # is the right format object found for a branch?
163
163
        # create a branch with a few known format objects.
164
 
        # this is not quite the same as 
 
164
        # this is not quite the same as
165
165
        self.build_tree(["foo/", "bar/"])
166
166
        def check_format(format, url):
167
167
            dir = format._matchingbzrdir.initialize(url)
170
170
            found_format = BranchFormat.find_format(dir)
171
171
            self.failUnless(isinstance(found_format, format.__class__))
172
172
        check_format(BzrBranchFormat5(), "bar")
173
 
        
 
173
 
174
174
    def test_find_format_not_branch(self):
175
175
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
176
176
        self.assertRaises(NotBranchError,
424
424
    def test_installed_hooks_are_BranchHooks(self):
425
425
        """The installed hooks object should be a BranchHooks."""
426
426
        # the installed hooks are saved in self._preserved_hooks.
427
 
        self.assertIsInstance(self._preserved_hooks[_mod_branch.Branch], BranchHooks)
 
427
        self.assertIsInstance(self._preserved_hooks[_mod_branch.Branch][1],
 
428
            BranchHooks)
428
429
 
429
430
 
430
431
class TestPullResult(TestCase):
451
452
 
452
453
    def lock_write(self):
453
454
        self.calls.append('lock_write')
454
 
    
 
455
 
455
456
    def unlock(self):
456
457
        self.calls.append('unlock')
457
458
        if self.unlock_exc is not None:
470
471
    """Tests for _run_with_write_locked_target."""
471
472
 
472
473
    def setUp(self):
 
474
        TestCase.setUp(self)
473
475
        self._calls = []
474
476
 
475
477
    def func_that_returns_ok(self):