← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_remote.py

  • Committer: Johan Walles
  • Date: 2009-05-07 05:08:46 UTC
  • mfrom: (4342 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4343.
  • Revision ID: johan.walles@gmail.com-20090507050846-nkwvcyauf1eh653q
Merge from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
2600
2600
        # from the backing branch, and one from the stacked on branch.
2601
2601
        self.assertLength(2, self.hpss_calls)
2602
2602
 
 
2603
    def test_stacked_pull_more_than_stacking_has_bug_360791(self):
 
2604
        # When pulling some fixed amount of content that is more than the
 
2605
        # source has (because some is coming from a fallback branch, no error
 
2606
        # should be received. This was reported as bug 360791.
 
2607
        # Need three branches: a trunk, a stacked branch, and a preexisting
 
2608
        # branch pulling content from stacked and trunk.
 
2609
        self.setup_smart_server_with_call_log()
 
2610
        trunk = self.make_branch_and_tree('trunk', format="1.9-rich-root")
 
2611
        r1 = trunk.commit('start')
 
2612
        stacked_branch = trunk.branch.create_clone_on_transport(
 
2613
            self.get_transport('stacked'), stacked_on=trunk.branch.base)
 
2614
        local = self.make_branch('local', format='1.9-rich-root')
 
2615
        local.repository.fetch(stacked_branch.repository,
 
2616
            stacked_branch.last_revision())
 
2617
 
2603
2618
 
2604
2619
class TestRemoteBranchEffort(tests.TestCaseWithTransport):
2605
2620