← Back to branch summary

~ubuntu-branches/ubuntu/maverick/bzr/maverick-proposed

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2010-02-17 17:47:40 UTC
  • mfrom: (1.4.5 upstream) (9.2.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20100217174740-35yh6t5rjnztg9z6
Tags: 2.1.0-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
67
67
 
68
68
    def get_MD(self, args, cmd=None, wd='branch'):
69
69
        out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
70
 
        return merge_directive.MergeDirective.from_lines(out.readlines())
 
70
        return merge_directive.MergeDirective.from_lines(out)
71
71
 
72
72
    def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
73
73
        md = self.get_MD(args, cmd=cmd, wd=wd)
280
280
        self.assertEqual('rev3', md.revision_id)
281
281
 
282
282
    def test_nonexistant_branch(self):
283
 
        if sys.platform == "win32":
284
 
            location = "C:/i/do/not/exist/"
285
 
        else:
286
 
            location = "/i/do/not/exist/"
 
283
        self.vfs_transport_factory = tests.MemoryServer
 
284
        location = self.get_url('absentdir/')
287
285
        out, err = self.run_bzr(["send", "--from", location], retcode=3)
288
286
        self.assertEqual(out, '')
289
287
        self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
324
322
        out, err = self.run_send(args)
325
323
        self.assertEquals(
326
324
            'Bundling %d revision(s).\n' % len(revs), err)
327
 
        md = merge_directive.MergeDirective.from_lines(
328
 
                StringIO(out).readlines())
 
325
        md = merge_directive.MergeDirective.from_lines(StringIO(out))
329
326
        self.assertEqual('parent', md.base_revision_id)
330
327
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
331
328
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
425
422
        self.assertSendFails([])
426
423
        self.assertSendSucceeds(['--no-strict'])
427
424
 
428
 
    def test_push_strict_command_line_override_config(self):
 
425
    def test_send_strict_command_line_override_config(self):
429
426
        self.set_config_send_strict('false')
430
427
        self.assertSendSucceeds([])
431
428
        self.assertSendFails(['--strict'])