← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

  • Committer: Andrew Bennetts
  • Date: 2008-10-30 01:05:59 UTC
  • mto: This revision was merged to the branch mainline in revision 3813.
  • Revision ID: andrew.bennetts@canonical.com-20081030010559-tumoefnsmhg4snxo
Add contrib/bzr_ssh_path_limiter.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007 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 the BzrDir facility and any format specific tests.
18
18
 
19
 
For interface contract tests, see tests/per_bzr_dir.
 
19
For interface contract tests, see tests/bzr_dir_implementations.
20
20
"""
21
21
 
22
22
import os
 
23
import os.path
 
24
from StringIO import StringIO
23
25
import subprocess
24
26
import sys
25
27
 
29
31
    help_topics,
30
32
    repository,
31
33
    osutils,
32
 
    remote,
 
34
    symbol_versioning,
33
35
    urlutils,
34
36
    win32utils,
35
37
    workingtree,
36
38
    )
37
39
import bzrlib.branch
38
40
from bzrlib.errors import (NotBranchError,
39
 
                           NoColocatedBranchSupport,
40
41
                           UnknownFormatError,
41
42
                           UnsupportedFormatError,
42
43
                           )
45
46
    TestCaseWithMemoryTransport,
46
47
    TestCaseWithTransport,
47
48
    TestSkipped,
 
49
    test_sftp_transport
48
50
    )
49
 
from bzrlib.tests import(
50
 
    http_server,
51
 
    http_utils,
 
51
from bzrlib.tests.http_server import HttpServer
 
52
from bzrlib.tests.http_utils import (
 
53
    TestCaseWithTwoWebservers,
 
54
    HTTPServerRedirecting,
52
55
    )
53
56
from bzrlib.tests.test_http import TestWithTransport_pycurl
54
 
from bzrlib.transport import (
55
 
    get_transport,
56
 
    memory,
57
 
    )
 
57
from bzrlib.transport import get_transport
58
58
from bzrlib.transport.http._urllib import HttpTransport_urllib
59
 
from bzrlib.transport.nosmart import NoSmartTransportDecorator
60
 
from bzrlib.transport.readonly import ReadonlyTransportDecorator
61
 
from bzrlib.repofmt import knitrepo, weaverepo, pack_repo
 
59
from bzrlib.transport.memory import MemoryServer
 
60
from bzrlib.repofmt import knitrepo, weaverepo
62
61
 
63
62
 
64
63
class TestDefaultFormat(TestCase):
84
83
        my_format_registry.register('weave', bzrdir.BzrDirFormat6,
85
84
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
86
85
            ' repositories', deprecated=True)
87
 
        my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir',
 
86
        my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir', 
88
87
            'BzrDirFormat6', 'Format registered lazily', deprecated=True)
89
88
        my_format_registry.register_metadir('knit',
90
89
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
117
116
        my_bzrdir = my_format_registry.make_bzrdir('weave')
118
117
        self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
119
118
        my_bzrdir = my_format_registry.make_bzrdir('default')
120
 
        self.assertIsInstance(my_bzrdir.repository_format,
 
119
        self.assertIsInstance(my_bzrdir.repository_format, 
121
120
            knitrepo.RepositoryFormatKnit1)
122
121
        my_bzrdir = my_format_registry.make_bzrdir('knit')
123
 
        self.assertIsInstance(my_bzrdir.repository_format,
 
122
        self.assertIsInstance(my_bzrdir.repository_format, 
124
123
            knitrepo.RepositoryFormatKnit1)
125
124
        my_bzrdir = my_format_registry.make_bzrdir('branch6')
126
125
        self.assertIsInstance(my_bzrdir.get_branch_format(),
130
129
        my_format_registry = self.make_format_registry()
131
130
        self.assertEqual('Format registered lazily',
132
131
                         my_format_registry.get_help('lazy'))
133
 
        self.assertEqual('Format using knits',
 
132
        self.assertEqual('Format using knits', 
134
133
                         my_format_registry.get_help('knit'))
135
 
        self.assertEqual('Format using knits',
 
134
        self.assertEqual('Format using knits', 
136
135
                         my_format_registry.get_help('default'))
137
136
        self.assertEqual('Pre-0.8 format.  Slower and does not support'
138
 
                         ' checkouts or shared repositories',
 
137
                         ' checkouts or shared repositories', 
139
138
                         my_format_registry.get_help('weave'))
140
 
 
 
139
        
141
140
    def test_help_topic(self):
142
141
        topics = help_topics.HelpTopicRegistry()
143
 
        registry = self.make_format_registry()
144
 
        topics.register('current-formats', registry.help_topic,
145
 
                        'Current formats')
146
 
        topics.register('other-formats', registry.help_topic,
147
 
                        'Other formats')
148
 
        new = topics.get_detail('current-formats')
149
 
        rest = topics.get_detail('other-formats')
 
142
        topics.register('formats', self.make_format_registry().help_topic, 
 
143
                        'Directory formats')
 
144
        topic = topics.get_detail('formats')
 
145
        new, rest = topic.split('Experimental formats')
150
146
        experimental, deprecated = rest.split('Deprecated formats')
151
 
        self.assertContainsRe(new, 'formats-help')
152
 
        self.assertContainsRe(new,
 
147
        self.assertContainsRe(new, 'These formats can be used')
 
148
        self.assertContainsRe(new, 
153
149
                ':knit:\n    \(native\) \(default\) Format using knits\n')
154
 
        self.assertContainsRe(experimental,
 
150
        self.assertContainsRe(experimental, 
155
151
                ':branch6:\n    \(native\) Experimental successor to knit')
156
 
        self.assertContainsRe(deprecated,
 
152
        self.assertContainsRe(deprecated, 
157
153
                ':lazy:\n    \(native\) Format registered lazily\n')
158
154
        self.assertNotContainsRe(new, 'hidden')
159
155
 
180
176
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
181
177
            ' repositories', deprecated=True, alias=True)
182
178
        self.assertEqual(frozenset(['weavealias']), a_registry.aliases())
183
 
 
 
179
    
184
180
 
185
181
class SampleBranch(bzrlib.branch.Branch):
186
182
    """A dummy branch for guess what, dummy use."""
189
185
        self.bzrdir = dir
190
186
 
191
187
 
192
 
class SampleRepository(bzrlib.repository.Repository):
193
 
    """A dummy repo."""
194
 
 
195
 
    def __init__(self, dir):
196
 
        self.bzrdir = dir
197
 
 
198
 
 
199
188
class SampleBzrDir(bzrdir.BzrDir):
200
189
    """A sample BzrDir implementation to allow testing static methods."""
201
190
 
205
194
 
206
195
    def open_repository(self):
207
196
        """See BzrDir.open_repository."""
208
 
        return SampleRepository(self)
 
197
        return "A repository"
209
198
 
210
 
    def create_branch(self, name=None):
 
199
    def create_branch(self):
211
200
        """See BzrDir.create_branch."""
212
 
        if name is not None:
213
 
            raise NoColocatedBranchSupport(self)
214
201
        return SampleBranch(self)
215
202
 
216
203
    def create_workingtree(self):
221
208
class SampleBzrDirFormat(bzrdir.BzrDirFormat):
222
209
    """A sample format
223
210
 
224
 
    this format is initializable, unsupported to aid in testing the
 
211
    this format is initializable, unsupported to aid in testing the 
225
212
    open and open_downlevel routines.
226
213
    """
227
214
 
248
235
    def test_find_format(self):
249
236
        # is the right format object found for a branch?
250
237
        # create a branch with a few known format objects.
251
 
        # this is not quite the same as
 
238
        # this is not quite the same as 
252
239
        t = get_transport(self.get_url())
253
240
        self.build_tree(["foo/", "bar/"], transport=t)
254
241
        def check_format(format, url):
258
245
            self.failUnless(isinstance(found_format, format.__class__))
259
246
        check_format(bzrdir.BzrDirFormat5(), "foo")
260
247
        check_format(bzrdir.BzrDirFormat6(), "bar")
261
 
 
 
248
        
262
249
    def test_find_format_nothing_there(self):
263
250
        self.assertRaises(NotBranchError,
264
251
                          bzrdir.BzrDirFormat.find_format,
308
295
                          branch.bzrdir.open_repository)
309
296
 
310
297
    def test_create_branch_and_repo_under_shared_force_new(self):
311
 
        # creating a branch and repo in a shared repo can be forced to
 
298
        # creating a branch and repo in a shared repo can be forced to 
312
299
        # make a new repo
313
300
        format = bzrdir.format_registry.make_bzrdir('knit')
314
301
        self.make_repository('.', shared=True, format=format)
319
306
 
320
307
    def test_create_standalone_working_tree(self):
321
308
        format = SampleBzrDirFormat()
322
 
        # note this is deliberately readonly, as this failure should
 
309
        # note this is deliberately readonly, as this failure should 
323
310
        # occur before any writes.
324
311
        self.assertRaises(errors.NotLocalUrl,
325
312
                          bzrdir.BzrDir.create_standalone_workingtree,
326
313
                          self.get_readonly_url(), format=format)
327
 
        tree = bzrdir.BzrDir.create_standalone_workingtree('.',
 
314
        tree = bzrdir.BzrDir.create_standalone_workingtree('.', 
328
315
                                                           format=format)
329
316
        self.assertEqual('A tree', tree)
330
317
 
332
319
        # create standalone working tree always makes a repo.
333
320
        format = bzrdir.format_registry.make_bzrdir('knit')
334
321
        self.make_repository('.', shared=True, format=format)
335
 
        # note this is deliberately readonly, as this failure should
 
322
        # note this is deliberately readonly, as this failure should 
336
323
        # occur before any writes.
337
324
        self.assertRaises(errors.NotLocalUrl,
338
325
                          bzrdir.BzrDir.create_standalone_workingtree,
339
326
                          self.get_readonly_url('child'), format=format)
340
 
        tree = bzrdir.BzrDir.create_standalone_workingtree('child',
 
327
        tree = bzrdir.BzrDir.create_standalone_workingtree('child', 
341
328
            format=format)
342
329
        tree.bzrdir.open_repository()
343
330
 
359
346
 
360
347
    def test_create_branch_convenience_root(self):
361
348
        """Creating a branch at the root of a fs should work."""
362
 
        self.vfs_transport_factory = memory.MemoryServer
 
349
        self.vfs_transport_factory = MemoryServer
363
350
        # outside a repo the default convenience output is a repo+branch_tree
364
351
        format = bzrdir.format_registry.make_bzrdir('knit')
365
 
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(),
 
352
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(), 
366
353
                                                         format=format)
367
354
        self.assertRaises(errors.NoWorkingTree,
368
355
                          branch.bzrdir.open_workingtree)
378
365
        branch.bzrdir.open_workingtree()
379
366
        self.assertRaises(errors.NoRepositoryPresent,
380
367
                          branch.bzrdir.open_repository)
381
 
 
 
368
            
382
369
    def test_create_branch_convenience_under_shared_repo_force_no_tree(self):
383
370
        # inside a repo the default convenience output is a branch+ follow the
384
371
        # repo tree policy but we can override that
390
377
                          branch.bzrdir.open_workingtree)
391
378
        self.assertRaises(errors.NoRepositoryPresent,
392
379
                          branch.bzrdir.open_repository)
393
 
 
 
380
            
394
381
    def test_create_branch_convenience_under_shared_repo_no_tree_policy(self):
395
382
        # inside a repo the default convenience output is a branch+ follow the
396
383
        # repo tree policy
397
384
        format = bzrdir.format_registry.make_bzrdir('knit')
398
385
        repo = self.make_repository('.', shared=True, format=format)
399
386
        repo.set_make_working_trees(False)
400
 
        branch = bzrdir.BzrDir.create_branch_convenience('child',
 
387
        branch = bzrdir.BzrDir.create_branch_convenience('child', 
401
388
                                                         format=format)
402
389
        self.assertRaises(errors.NoWorkingTree,
403
390
                          branch.bzrdir.open_workingtree)
433
420
        """The default acquisition policy should create a standalone branch."""
434
421
        my_bzrdir = self.make_bzrdir('.')
435
422
        repo_policy = my_bzrdir.determine_repository_policy()
436
 
        repo, is_new = repo_policy.acquire_repository()
 
423
        repo = repo_policy.acquire_repository()
437
424
        self.assertEqual(repo.bzrdir.root_transport.base,
438
425
                         my_bzrdir.root_transport.base)
439
426
        self.assertFalse(repo.is_shared())
440
427
 
 
428
 
441
429
    def test_determine_stacking_policy(self):
442
430
        parent_bzrdir = self.make_bzrdir('.')
443
431
        child_bzrdir = self.make_bzrdir('child')
467
455
        self.assertEqual(child_branch.base,
468
456
                         new_child.open_branch().get_stacked_on_url())
469
457
 
470
 
    def test_default_stacking_with_stackable_branch_unstackable_repo(self):
471
 
        # Make stackable source branch with an unstackable repo format.
472
 
        source_bzrdir = self.make_bzrdir('source')
473
 
        pack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
474
 
        source_branch = bzrlib.branch.BzrBranchFormat7().initialize(source_bzrdir)
475
 
        # Make a directory with a default stacking policy
476
 
        parent_bzrdir = self.make_bzrdir('parent')
477
 
        stacked_on = self.make_branch('parent/stacked-on', format='pack-0.92')
478
 
        parent_bzrdir.get_config().set_default_stack_on(stacked_on.base)
479
 
        # Clone source into directory
480
 
        target = source_bzrdir.clone(self.get_url('parent/target'))
481
 
 
482
458
    def test_sprout_obeys_stacking_policy(self):
483
459
        child_branch, new_child_transport = self.prepare_default_stacking()
484
460
        new_child = child_branch.bzrdir.sprout(new_child_transport.base)
570
546
 
571
547
    def setUp(self):
572
548
        super(ChrootedTests, self).setUp()
573
 
        if not self.vfs_transport_factory == memory.MemoryServer:
574
 
            self.transport_readonly_server = http_server.HttpServer
 
549
        if not self.vfs_transport_factory == MemoryServer:
 
550
            self.transport_readonly_server = HttpServer
575
551
 
576
552
    def local_branch_path(self, branch):
577
553
         return os.path.realpath(urlutils.local_path_from_url(branch.base))
738
714
        opened_bzrdir = bzrdir.BzrDir.open_from_transport(transport)
739
715
        self.assertEqual(transport.base, opened_bzrdir.root_transport.base)
740
716
        self.assertIsInstance(opened_bzrdir, bzrdir.BzrDir)
741
 
 
 
717
        
742
718
    def test_open_from_transport_no_bzrdir(self):
743
719
        transport = get_transport(self.get_url())
744
720
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
753
729
                          transport)
754
730
 
755
731
    def test_sprout_recursive(self):
756
 
        tree = self.make_branch_and_tree('tree1',
757
 
                                         format='dirstate-with-subtree')
 
732
        tree = self.make_branch_and_tree('tree1', format='dirstate-with-subtree')
758
733
        sub_tree = self.make_branch_and_tree('tree1/subtree',
759
734
            format='dirstate-with-subtree')
760
 
        sub_tree.set_root_id('subtree-root')
761
735
        tree.add_reference(sub_tree)
762
736
        self.build_tree(['tree1/subtree/file'])
763
737
        sub_tree.add('file')
764
738
        tree.commit('Initial commit')
765
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
766
 
        tree2.lock_read()
767
 
        self.addCleanup(tree2.unlock)
 
739
        tree.bzrdir.sprout('tree2')
768
740
        self.failUnlessExists('tree2/subtree/file')
769
 
        self.assertEqual('tree-reference', tree2.kind('subtree-root'))
770
741
 
771
742
    def test_cloning_metadir(self):
772
743
        """Ensure that cloning metadir is suitable"""
898
869
 
899
870
    def test_needs_conversion_different_working_tree(self):
900
871
        # meta1dirs need an conversion if any element is not the default.
901
 
        new_format = bzrdir.format_registry.make_bzrdir('dirstate')
902
 
        tree = self.make_branch_and_tree('tree', format='knit')
903
 
        self.assertTrue(tree.bzrdir.needs_format_conversion(
904
 
            new_format))
905
 
 
906
 
    def test_initialize_on_format_uses_smart_transport(self):
907
 
        self.setup_smart_server_with_call_log()
908
 
        new_format = bzrdir.format_registry.make_bzrdir('dirstate')
909
 
        transport = self.get_transport('target')
910
 
        transport.ensure_base()
911
 
        self.reset_smart_call_log()
912
 
        instance = new_format.initialize_on_transport(transport)
913
 
        self.assertIsInstance(instance, remote.RemoteBzrDir)
914
 
        rpc_count = len(self.hpss_calls)
915
 
        # This figure represent the amount of work to perform this use case. It
916
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
917
 
        # being too low. If rpc_count increases, more network roundtrips have
918
 
        # become necessary for this use case. Please do not adjust this number
919
 
        # upwards without agreement from bzr's network support maintainers.
920
 
        self.assertEqual(2, rpc_count)
 
872
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
873
        # test with 
 
874
        new_default = bzrdir.format_registry.make_bzrdir('dirstate')
 
875
        bzrdir.BzrDirFormat._set_default_format(new_default)
 
876
        try:
 
877
            tree = self.make_branch_and_tree('tree', format='knit')
 
878
            self.assertTrue(tree.bzrdir.needs_format_conversion())
 
879
        finally:
 
880
            bzrdir.BzrDirFormat._set_default_format(old_format)
921
881
 
922
882
 
923
883
class TestFormat5(TestCaseWithTransport):
924
884
    """Tests specific to the version 5 bzrdir format."""
925
885
 
926
886
    def test_same_lockfiles_between_tree_repo_branch(self):
927
 
        # this checks that only a single lockfiles instance is created
 
887
        # this checks that only a single lockfiles instance is created 
928
888
        # for format 5 objects
929
889
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
930
890
        def check_dir_components_use_same_lock(dir):
937
897
        # and if we open it normally.
938
898
        dir = bzrdir.BzrDir.open(self.get_url())
939
899
        check_dir_components_use_same_lock(dir)
940
 
 
 
900
    
941
901
    def test_can_convert(self):
942
902
        # format 5 dirs are convertable
943
903
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
944
904
        self.assertTrue(dir.can_convert_format())
945
 
 
 
905
    
946
906
    def test_needs_conversion(self):
947
 
        # format 5 dirs need a conversion if they are not the default,
948
 
        # and they aren't
949
 
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
950
 
        # don't need to convert it to itself
951
 
        self.assertFalse(dir.needs_format_conversion(bzrdir.BzrDirFormat5()))
952
 
        # do need to convert it to the current default
953
 
        self.assertTrue(dir.needs_format_conversion(
954
 
            bzrdir.BzrDirFormat.get_default_format()))
 
907
        # format 5 dirs need a conversion if they are not the default.
 
908
        # and they start of not the default.
 
909
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
910
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
911
        try:
 
912
            dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
 
913
            self.assertFalse(dir.needs_format_conversion())
 
914
        finally:
 
915
            bzrdir.BzrDirFormat._set_default_format(old_format)
 
916
        self.assertTrue(dir.needs_format_conversion())
955
917
 
956
918
 
957
919
class TestFormat6(TestCaseWithTransport):
958
920
    """Tests specific to the version 6 bzrdir format."""
959
921
 
960
922
    def test_same_lockfiles_between_tree_repo_branch(self):
961
 
        # this checks that only a single lockfiles instance is created
 
923
        # this checks that only a single lockfiles instance is created 
962
924
        # for format 6 objects
963
925
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
964
926
        def check_dir_components_use_same_lock(dir):
971
933
        # and if we open it normally.
972
934
        dir = bzrdir.BzrDir.open(self.get_url())
973
935
        check_dir_components_use_same_lock(dir)
974
 
 
 
936
    
975
937
    def test_can_convert(self):
976
938
        # format 6 dirs are convertable
977
939
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
978
940
        self.assertTrue(dir.can_convert_format())
979
 
 
 
941
    
980
942
    def test_needs_conversion(self):
981
943
        # format 6 dirs need an conversion if they are not the default.
982
 
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
983
 
        self.assertTrue(dir.needs_format_conversion(
984
 
            bzrdir.BzrDirFormat.get_default_format()))
 
944
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
945
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirMetaFormat1())
 
946
        try:
 
947
            dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
 
948
            self.assertTrue(dir.needs_format_conversion())
 
949
        finally:
 
950
            bzrdir.BzrDirFormat._set_default_format(old_format)
985
951
 
986
952
 
987
953
class NotBzrDir(bzrlib.bzrdir.BzrDir):
1018
984
 
1019
985
class TestNotBzrDir(TestCaseWithTransport):
1020
986
    """Tests for using the bzrdir api with a non .bzr based disk format.
1021
 
 
 
987
    
1022
988
    If/when one of these is in the core, we can let the implementation tests
1023
989
    verify this works.
1024
990
    """
1025
991
 
1026
992
    def test_create_and_find_format(self):
1027
 
        # create a .notbzr dir
 
993
        # create a .notbzr dir 
1028
994
        format = NotBzrDirFormat()
1029
995
        dir = format.initialize(self.get_url())
1030
996
        self.assertIsInstance(dir, NotBzrDir)
1054
1020
 
1055
1021
    def setUp(self):
1056
1022
        super(NonLocalTests, self).setUp()
1057
 
        self.vfs_transport_factory = memory.MemoryServer
1058
 
 
 
1023
        self.vfs_transport_factory = MemoryServer
 
1024
    
1059
1025
    def test_create_branch_convenience(self):
1060
1026
        # outside a repo the default convenience output is a repo+branch_tree
1061
1027
        format = bzrdir.format_registry.make_bzrdir('knit')
1098
1064
                              workingtree.WorkingTreeFormat3)
1099
1065
 
1100
1066
 
1101
 
class TestHTTPRedirections(object):
1102
 
    """Test redirection between two http servers.
 
1067
class TestHTTPRedirectionLoop(object):
 
1068
    """Test redirection loop between two http servers.
1103
1069
 
1104
1070
    This MUST be used by daughter classes that also inherit from
1105
1071
    TestCaseWithTwoWebservers.
1106
1072
 
1107
1073
    We can't inherit directly from TestCaseWithTwoWebservers or the
1108
1074
    test framework will try to create an instance which cannot
1109
 
    run, its implementation being incomplete.
 
1075
    run, its implementation being incomplete. 
1110
1076
    """
1111
1077
 
 
1078
    # Should be defined by daughter classes to ensure redirection
 
1079
    # still use the same transport implementation (not currently
 
1080
    # enforced as it's a bit tricky to get right (see the FIXME
 
1081
    # in BzrDir.open_from_transport for the unique use case so
 
1082
    # far)
 
1083
    _qualifier = None
 
1084
 
1112
1085
    def create_transport_readonly_server(self):
1113
 
        return http_utils.HTTPServerRedirecting()
 
1086
        return HTTPServerRedirecting()
1114
1087
 
1115
1088
    def create_transport_secondary_server(self):
1116
 
        return http_utils.HTTPServerRedirecting()
 
1089
        return HTTPServerRedirecting()
1117
1090
 
1118
1091
    def setUp(self):
1119
 
        super(TestHTTPRedirections, self).setUp()
 
1092
        # Both servers redirect to each server creating a loop
 
1093
        super(TestHTTPRedirectionLoop, self).setUp()
1120
1094
        # The redirections will point to the new server
1121
1095
        self.new_server = self.get_readonly_server()
1122
1096
        # The requests to the old server will be redirected
1123
1097
        self.old_server = self.get_secondary_server()
1124
1098
        # Configure the redirections
1125
1099
        self.old_server.redirect_to(self.new_server.host, self.new_server.port)
 
1100
        self.new_server.redirect_to(self.old_server.host, self.old_server.port)
 
1101
 
 
1102
    def _qualified_url(self, host, port):
 
1103
        return 'http+%s://%s:%s' % (self._qualifier, host, port)
1126
1104
 
1127
1105
    def test_loop(self):
1128
 
        # Both servers redirect to each other creating a loop
1129
 
        self.new_server.redirect_to(self.old_server.host, self.old_server.port)
1130
1106
        # Starting from either server should loop
1131
 
        old_url = self._qualified_url(self.old_server.host,
 
1107
        old_url = self._qualified_url(self.old_server.host, 
1132
1108
                                      self.old_server.port)
1133
1109
        oldt = self._transport(old_url)
1134
1110
        self.assertRaises(errors.NotBranchError,
1135
1111
                          bzrdir.BzrDir.open_from_transport, oldt)
1136
 
        new_url = self._qualified_url(self.new_server.host,
 
1112
        new_url = self._qualified_url(self.new_server.host, 
1137
1113
                                      self.new_server.port)
1138
1114
        newt = self._transport(new_url)
1139
1115
        self.assertRaises(errors.NotBranchError,
1140
1116
                          bzrdir.BzrDir.open_from_transport, newt)
1141
1117
 
1142
 
    def test_qualifier_preserved(self):
1143
 
        wt = self.make_branch_and_tree('branch')
1144
 
        old_url = self._qualified_url(self.old_server.host,
1145
 
                                      self.old_server.port)
1146
 
        start = self._transport(old_url).clone('branch')
1147
 
        bdir = bzrdir.BzrDir.open_from_transport(start)
1148
 
        # Redirection should preserve the qualifier, hence the transport class
1149
 
        # itself.
1150
 
        self.assertIsInstance(bdir.root_transport, type(start))
1151
 
 
1152
 
 
1153
 
class TestHTTPRedirections_urllib(TestHTTPRedirections,
1154
 
                                  http_utils.TestCaseWithTwoWebservers):
 
1118
 
 
1119
class TestHTTPRedirections_urllib(TestHTTPRedirectionLoop,
 
1120
                                  TestCaseWithTwoWebservers):
1155
1121
    """Tests redirections for urllib implementation"""
1156
1122
 
 
1123
    _qualifier = 'urllib'
1157
1124
    _transport = HttpTransport_urllib
1158
1125
 
1159
 
    def _qualified_url(self, host, port):
1160
 
        result = 'http+urllib://%s:%s' % (host, port)
1161
 
        self.permit_url(result)
1162
 
        return result
1163
 
 
1164
1126
 
1165
1127
 
1166
1128
class TestHTTPRedirections_pycurl(TestWithTransport_pycurl,
1167
 
                                  TestHTTPRedirections,
1168
 
                                  http_utils.TestCaseWithTwoWebservers):
 
1129
                                  TestHTTPRedirectionLoop,
 
1130
                                  TestCaseWithTwoWebservers):
1169
1131
    """Tests redirections for pycurl implementation"""
1170
1132
 
1171
 
    def _qualified_url(self, host, port):
1172
 
        result = 'http+pycurl://%s:%s' % (host, port)
1173
 
        self.permit_url(result)
1174
 
        return result
1175
 
 
1176
 
 
1177
 
class TestHTTPRedirections_nosmart(TestHTTPRedirections,
1178
 
                                  http_utils.TestCaseWithTwoWebservers):
1179
 
    """Tests redirections for the nosmart decorator"""
1180
 
 
1181
 
    _transport = NoSmartTransportDecorator
1182
 
 
1183
 
    def _qualified_url(self, host, port):
1184
 
        result = 'nosmart+http://%s:%s' % (host, port)
1185
 
        self.permit_url(result)
1186
 
        return result
1187
 
 
1188
 
 
1189
 
class TestHTTPRedirections_readonly(TestHTTPRedirections,
1190
 
                                    http_utils.TestCaseWithTwoWebservers):
1191
 
    """Tests redirections for readonly decoratror"""
1192
 
 
1193
 
    _transport = ReadonlyTransportDecorator
1194
 
 
1195
 
    def _qualified_url(self, host, port):
1196
 
        result = 'readonly+http://%s:%s' % (host, port)
1197
 
        self.permit_url(result)
1198
 
        return result
 
1133
    _qualifier = 'pycurl'
1199
1134
 
1200
1135
 
1201
1136
class TestDotBzrHidden(TestCaseWithTransport):
1236
1171
 
1237
1172
class _TestBzrDir(bzrdir.BzrDirMeta1):
1238
1173
    """Test BzrDir implementation for TestBzrDirSprout.
1239
 
 
 
1174
    
1240
1175
    When created a _TestBzrDir already has repository and a branch.  The branch
1241
1176
    is a test double as well.
1242
1177
    """
1253
1188
        return _TestBzrDirFormat()
1254
1189
 
1255
1190
 
1256
 
class _TestBranchFormat(bzrlib.branch.BranchFormat):
1257
 
    """Test Branch format for TestBzrDirSprout."""
1258
 
 
1259
 
 
1260
1191
class _TestBranch(bzrlib.branch.Branch):
1261
1192
    """Test Branch implementation for TestBzrDirSprout."""
1262
1193
 
1263
1194
    def __init__(self, *args, **kwargs):
1264
 
        self._format = _TestBranchFormat()
1265
1195
        super(_TestBranch, self).__init__(*args, **kwargs)
1266
1196
        self.calls = []
1267
1197
        self._parent = None
1288
1218
        Usually, BzrDir.sprout should delegate to the branch's sprout method
1289
1219
        for part of the work.  This allows the source branch to control the
1290
1220
        choice of format for the new branch.
1291
 
 
 
1221
        
1292
1222
        There are exceptions, but this tests avoids them:
1293
1223
          - if there's no branch in the source bzrdir,
1294
1224
          - or if the stacking has been requested and the format needs to be
1315
1245
        parent = grandparent_tree.bzrdir.sprout('parent').open_branch()
1316
1246
        branch_tree = parent.bzrdir.sprout('branch').open_branch()
1317
1247
        self.assertContainsRe(branch_tree.get_parent(), '/parent/$')
1318
 
 
1319
 
 
1320
 
class TestBzrDirHooks(TestCaseWithMemoryTransport):
1321
 
 
1322
 
    def test_pre_open_called(self):
1323
 
        calls = []
1324
 
        bzrdir.BzrDir.hooks.install_named_hook('pre_open', calls.append, None)
1325
 
        transport = self.get_transport('foo')
1326
 
        url = transport.base
1327
 
        self.assertRaises(errors.NotBranchError, bzrdir.BzrDir.open, url)
1328
 
        self.assertEqual([transport.base], [t.base for t in calls])
1329
 
 
1330
 
    def test_pre_open_actual_exceptions_raised(self):
1331
 
        count = [0]
1332
 
        def fail_once(transport):
1333
 
            count[0] += 1
1334
 
            if count[0] == 1:
1335
 
                raise errors.BzrError("fail")
1336
 
        bzrdir.BzrDir.hooks.install_named_hook('pre_open', fail_once, None)
1337
 
        transport = self.get_transport('foo')
1338
 
        url = transport.base
1339
 
        err = self.assertRaises(errors.BzrError, bzrdir.BzrDir.open, url)
1340
 
        self.assertEqual('fail', err._preformatted_string)