~ubuntu-branches/ubuntu/karmic/bzr/karmic-proposed

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_push.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2009-05-16 13:51:08 UTC
  • mfrom: (1.1.53 upstream) (3.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20090516135108-aqmj2jtbt445f5ul
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
201
201
        # being too low. If rpc_count increases, more network roundtrips have
202
202
        # become necessary for this use case. Please do not adjust this number
203
203
        # upwards without agreement from bzr's network support maintainers.
204
 
        self.assertLength(20, self.hpss_calls)
 
204
        self.assertLength(9, self.hpss_calls)
205
205
 
206
206
    def test_push_smart_stacked_streaming_acceptance(self):
207
207
        self.setup_smart_server_with_call_log()
217
217
        # being too low. If rpc_count increases, more network roundtrips have
218
218
        # become necessary for this use case. Please do not adjust this number
219
219
        # upwards without agreement from bzr's network support maintainers.
220
 
        self.assertLength(43, self.hpss_calls)
 
220
        self.assertLength(14, self.hpss_calls)
221
221
        remote = Branch.open('public')
222
222
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
223
223
 
306
306
        self.assertEqual(tree_to.branch.last_revision_info()[1], 'from-1')
307
307
 
308
308
        self.run_bzr_error(
309
 
            "bzr: ERROR: bzr push --revision takes one value.\n",
 
309
            ['bzr: ERROR: bzr push --revision '
 
310
             'takes exactly one revision identifier\n'],
310
311
            'push -r0..2 ../to', working_dir='from')
311
312
 
312
313
    def create_trunk_and_feature_branch(self):