← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-03-02 08:49:07 UTC
  • mfrom: (5067.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100302084907-z4r0yoa4ldspjz82
(vila) Resolve --take-this or --take-other correctly rename kept file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
1
 
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
# Authors: Aaron Bentley
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
26
26
    tests,
27
27
    )
28
28
from bzrlib.bundle import serializer
 
29
from bzrlib.transport import memory
29
30
 
30
31
 
31
32
def load_tests(standard_tests, module, loader):
67
68
 
68
69
    def get_MD(self, args, cmd=None, wd='branch'):
69
70
        out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
70
 
        return merge_directive.MergeDirective.from_lines(out.readlines())
 
71
        return merge_directive.MergeDirective.from_lines(out)
71
72
 
72
73
    def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
73
74
        md = self.get_MD(args, cmd=cmd, wd=wd)
280
281
        self.assertEqual('rev3', md.revision_id)
281
282
 
282
283
    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/"
 
284
        self.vfs_transport_factory = memory.MemoryServer
 
285
        location = self.get_url('absentdir/')
287
286
        out, err = self.run_bzr(["send", "--from", location], retcode=3)
288
287
        self.assertEqual(out, '')
289
288
        self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
324
323
        out, err = self.run_send(args)
325
324
        self.assertEquals(
326
325
            'Bundling %d revision(s).\n' % len(revs), err)
327
 
        md = merge_directive.MergeDirective.from_lines(
328
 
                StringIO(out).readlines())
 
326
        md = merge_directive.MergeDirective.from_lines(StringIO(out))
329
327
        self.assertEqual('parent', md.base_revision_id)
330
328
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
331
329
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
425
423
        self.assertSendFails([])
426
424
        self.assertSendSucceeds(['--no-strict'])
427
425
 
428
 
    def test_push_strict_command_line_override_config(self):
 
426
    def test_send_strict_command_line_override_config(self):
429
427
        self.set_config_send_strict('false')
430
428
        self.assertSendSucceeds([])
431
429
        self.assertSendFails(['--strict'])