← 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-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

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)
308
307
    _default_sent_revs = ['local']
309
308
    _default_errors = ['Working tree ".*/local/" has uncommitted '
310
309
                       'changes \(See bzr status\)\.',]
 
310
    _default_additional_error = 'Use --no-strict to force the send.\n'
 
311
    _default_additional_warning = 'Uncommitted changes will not be sent.'
311
312
 
312
313
    def set_config_send_strict(self, value):
313
314
        # set config var (any of bazaar.conf, locations.conf, branch.conf
316
317
        conf.set_user_option('send_strict', value)
317
318
 
318
319
    def assertSendFails(self, args):
319
 
        self.run_send(args, rc=3, err_re=self._default_errors)
 
320
        out, err = self.run_send(args, rc=3, err_re=self._default_errors)
 
321
        self.assertContainsRe(err, self._default_additional_error)
320
322
 
321
 
    def assertSendSucceeds(self, args, revs=None):
 
323
    def assertSendSucceeds(self, args, revs=None, with_warning=False):
 
324
        if with_warning:
 
325
            err_re = self._default_errors
 
326
        else:
 
327
            err_re = []
322
328
        if revs is None:
323
329
            revs = self._default_sent_revs
324
 
        out, err = self.run_send(args)
325
 
        self.assertEquals(
326
 
            'Bundling %d revision(s).\n' % len(revs), err)
327
 
        md = merge_directive.MergeDirective.from_lines(
328
 
                StringIO(out).readlines())
 
330
        out, err = self.run_send(args, err_re=err_re)
 
331
        bundling_revs = 'Bundling %d revision(s).\n' % len(revs)
 
332
        if with_warning:
 
333
            self.assertContainsRe(err, self._default_additional_warning)
 
334
            self.assertEndsWith(err, bundling_revs)
 
335
        else:
 
336
            self.assertEquals(bundling_revs, err)
 
337
        md = merge_directive.MergeDirective.from_lines(StringIO(out))
329
338
        self.assertEqual('parent', md.base_revision_id)
330
339
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
331
340
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
398
407
        self._default_sent_revs = ['modified-in-local', 'local']
399
408
 
400
409
    def test_send_default(self):
401
 
        self.assertSendFails([])
 
410
        self.assertSendSucceeds([], with_warning=True)
402
411
 
403
412
    def test_send_with_revision(self):
404
413
        self.assertSendSucceeds(['-r', 'revid:local'], revs=['local'])
414
423
        self.assertSendFails([])
415
424
        self.assertSendSucceeds(['--no-strict'])
416
425
 
417
 
 
418
426
    def test_send_bogus_config_var_ignored(self):
419
427
        self.set_config_send_strict("I'm unsure")
420
 
        self.assertSendFails([])
421
 
 
 
428
        self.assertSendSucceeds([], with_warning=True)
422
429
 
423
430
    def test_send_no_strict_command_line_override_config(self):
424
431
        self.set_config_send_strict('true')
425
432
        self.assertSendFails([])
426
433
        self.assertSendSucceeds(['--no-strict'])
427
434
 
428
 
    def test_push_strict_command_line_override_config(self):
 
435
    def test_send_strict_command_line_override_config(self):
429
436
        self.set_config_send_strict('false')
430
437
        self.assertSendSucceeds([])
431
438
        self.assertSendFails(['--strict'])