← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/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/branch_implementations/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 branch implementations - tests a branch format."""
18
18
 
109
109
        wt.commit('lala!', rev_id='revision-1', allow_pointless=False)
110
110
 
111
111
        b2 = self.make_branch('b2')
112
 
        self.assertEqual((1, []), b2.fetch(b1))
 
112
        b2.fetch(b1)
113
113
 
114
114
        rev = b2.repository.get_revision('revision-1')
115
115
        tree = b2.repository.revision_tree('revision-1')
212
212
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.com')
213
213
        branch.set_submit_branch('sftp://example.net')
214
214
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.net')
215
 
        
 
215
 
216
216
    def test_public_branch(self):
217
217
        """public location can be queried and set"""
218
218
        branch = self.make_branch('branch')
258
258
                          None)
259
259
 
260
260
# TODO 20051003 RBC:
261
 
# compare the gpg-to-sign info for a commit with a ghost and 
 
261
# compare the gpg-to-sign info for a commit with a ghost and
262
262
#     an identical tree without a ghost
263
263
# fetch missing should rewrite the TOC of weaves to list newly available parents.
264
 
        
 
264
 
265
265
    def test_sign_existing_revision(self):
266
266
        wt = self.make_branch_and_tree('.')
267
267
        branch = wt.branch
352
352
 
353
353
    def test_nicks(self):
354
354
        """Test explicit and implicit branch nicknames.
355
 
        
 
355
 
356
356
        Nicknames are implicitly the name of the branch's directory, unless an
357
357
        explicit nickname is set.  That is, an explicit nickname always
358
358
        overrides the implicit one.
493
493
        self.assertEquals(br.revision_history(), [])
494
494
 
495
495
 
 
496
class TestBranchFormat(TestCaseWithBranch):
 
497
 
 
498
    def test_branch_format_network_name(self):
 
499
        br = self.make_branch('.')
 
500
        format = br._format
 
501
        network_name = format.network_name()
 
502
        self.assertIsInstance(network_name, str)
 
503
        # We want to test that the network_name matches the actual format on
 
504
        # disk. For local branches that means that using network_name as a key
 
505
        # in the registry gives back the same format. For remote branches we
 
506
        # check that the network_name of the RemoteBranchFormat we have locally
 
507
        # matches the actual format present on disk.
 
508
        if isinstance(format, remote.RemoteBranchFormat):
 
509
            br._ensure_real()
 
510
            real_branch = br._real_branch
 
511
            self.assertEqual(real_branch._format.network_name(), network_name)
 
512
        else:
 
513
            registry = branch.network_format_registry
 
514
            looked_up_format = registry.get(network_name)
 
515
            self.assertEqual(format.__class__, looked_up_format.__class__)
 
516
 
 
517
 
496
518
class ChrootedTests(TestCaseWithBranch):
497
519
    """A support class that provides readonly urls outside the local namespace.
498
520
 
730
752
        tree3.merge_from_branch(tree2.branch)
731
753
        tree3.commit('empty commit 6')
732
754
        tree2.pull(tree3.branch)
 
755
 
 
756
 
 
757
class TestIgnoreFallbacksParameter(TestCaseWithBranch):
 
758
 
 
759
    def make_branch_with_fallback(self):
 
760
        fallback = self.make_branch('fallback')
 
761
        if not fallback._format.supports_stacking():
 
762
            raise tests.TestNotApplicable("format does not support stacking")
 
763
        stacked = self.make_branch('stacked')
 
764
        stacked.set_stacked_on_url(fallback.base)
 
765
        return stacked
 
766
 
 
767
    def test_fallbacks_not_opened(self):
 
768
        stacked = self.make_branch_with_fallback()
 
769
        self.get_transport('').rename('fallback', 'moved')
 
770
        reopened = stacked.bzrdir.open_branch(ignore_fallbacks=True)
 
771
        self.assertEqual([], reopened.repository._fallback_repositories)
 
772
        
 
773
    def test_fallbacks_are_opened(self):
 
774
        stacked = self.make_branch_with_fallback()
 
775
        reopened = stacked.bzrdir.open_branch(ignore_fallbacks=False)
 
776
        self.assertLength(1, reopened.repository._fallback_repositories)