← 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: INADA Naoki
  • Date: 2011-05-18 06:01:08 UTC
  • mto: This revision was merged to the branch mainline in revision 5894.
  • Revision ID: songofacandy@gmail.com-20110518060108-86t2kffcrzu0nf6i
Update Japanese docs.

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-2011 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
 
 
30
 
 
31
 
def load_tests(standard_tests, module, loader):
32
 
    """Multiply tests for the send command."""
33
 
    result = loader.suiteClass()
34
 
 
35
 
    # one for each king of change
36
 
    changes_tests, remaining_tests = tests.split_suite_by_condition(
37
 
        standard_tests, tests.condition_isinstance((
38
 
                TestSendStrictWithChanges,
39
 
                )))
40
 
    changes_scenarios = [
41
 
        ('uncommitted',
42
 
         dict(_changes_type='_uncommitted_changes')),
43
 
        ('pending_merges',
44
 
         dict(_changes_type='_pending_merges')),
45
 
        ('out-of-sync-trees',
46
 
         dict(_changes_type='_out_of_sync_trees')),
47
 
        ]
48
 
    tests.multiply_tests(changes_tests, changes_scenarios, result)
49
 
    # No parametrization for the remaining tests
50
 
    result.addTests(remaining_tests)
51
 
 
52
 
    return result
 
29
from bzrlib.transport import memory
 
30
from bzrlib.tests.scenarios import load_tests_apply_scenarios
 
31
 
 
32
 
 
33
load_tests = load_tests_apply_scenarios
53
34
 
54
35
 
55
36
class TestSendMixin(object):
67
48
 
68
49
    def get_MD(self, args, cmd=None, wd='branch'):
69
50
        out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
70
 
        return merge_directive.MergeDirective.from_lines(out.readlines())
 
51
        return merge_directive.MergeDirective.from_lines(out)
71
52
 
72
53
    def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
73
54
        md = self.get_MD(args, cmd=cmd, wd=wd)
280
261
        self.assertEqual('rev3', md.revision_id)
281
262
 
282
263
    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/"
 
264
        self.vfs_transport_factory = memory.MemoryServer
 
265
        location = self.get_url('absentdir/')
287
266
        out, err = self.run_bzr(["send", "--from", location], retcode=3)
288
267
        self.assertEqual(out, '')
289
268
        self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
308
287
    _default_sent_revs = ['local']
309
288
    _default_errors = ['Working tree ".*/local/" has uncommitted '
310
289
                       'changes \(See bzr status\)\.',]
 
290
    _default_additional_error = 'Use --no-strict to force the send.\n'
 
291
    _default_additional_warning = 'Uncommitted changes will not be sent.'
311
292
 
312
293
    def set_config_send_strict(self, value):
313
294
        # set config var (any of bazaar.conf, locations.conf, branch.conf
316
297
        conf.set_user_option('send_strict', value)
317
298
 
318
299
    def assertSendFails(self, args):
319
 
        self.run_send(args, rc=3, err_re=self._default_errors)
 
300
        out, err = self.run_send(args, rc=3, err_re=self._default_errors)
 
301
        self.assertContainsRe(err, self._default_additional_error)
320
302
 
321
 
    def assertSendSucceeds(self, args, revs=None):
 
303
    def assertSendSucceeds(self, args, revs=None, with_warning=False):
 
304
        if with_warning:
 
305
            err_re = self._default_errors
 
306
        else:
 
307
            err_re = []
322
308
        if revs is None:
323
309
            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())
 
310
        out, err = self.run_send(args, err_re=err_re)
 
311
        bundling_revs = 'Bundling %d revision(s).\n' % len(revs)
 
312
        if with_warning:
 
313
            self.assertContainsRe(err, self._default_additional_warning)
 
314
            self.assertEndsWith(err, bundling_revs)
 
315
        else:
 
316
            self.assertEquals(bundling_revs, err)
 
317
        md = merge_directive.MergeDirective.from_lines(StringIO(out))
329
318
        self.assertEqual('parent', md.base_revision_id)
330
319
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
331
320
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
359
348
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
360
349
                                   TestSendStrictMixin):
361
350
 
 
351
    # These are textually the same as test_push.strict_push_change_scenarios,
 
352
    # but since the functions are reimplemented here, the definitions are left
 
353
    # here too.
 
354
    scenarios = [
 
355
        ('uncommitted',
 
356
         dict(_changes_type='_uncommitted_changes')),
 
357
        ('pending_merges',
 
358
         dict(_changes_type='_pending_merges')),
 
359
        ('out-of-sync-trees',
 
360
         dict(_changes_type='_out_of_sync_trees')),
 
361
        ]
 
362
 
362
363
    _changes_type = None # Set by load_tests
363
364
 
364
365
    def setUp(self):
398
399
        self._default_sent_revs = ['modified-in-local', 'local']
399
400
 
400
401
    def test_send_default(self):
401
 
        self.assertSendFails([])
 
402
        self.assertSendSucceeds([], with_warning=True)
402
403
 
403
404
    def test_send_with_revision(self):
404
405
        self.assertSendSucceeds(['-r', 'revid:local'], revs=['local'])
414
415
        self.assertSendFails([])
415
416
        self.assertSendSucceeds(['--no-strict'])
416
417
 
417
 
 
418
418
    def test_send_bogus_config_var_ignored(self):
419
419
        self.set_config_send_strict("I'm unsure")
420
 
        self.assertSendFails([])
421
 
 
 
420
        self.assertSendSucceeds([], with_warning=True)
422
421
 
423
422
    def test_send_no_strict_command_line_override_config(self):
424
423
        self.set_config_send_strict('true')
425
424
        self.assertSendFails([])
426
425
        self.assertSendSucceeds(['--no-strict'])
427
426
 
428
 
    def test_push_strict_command_line_override_config(self):
 
427
    def test_send_strict_command_line_override_config(self):
429
428
        self.set_config_send_strict('false')
430
429
        self.assertSendSucceeds([])
431
430
        self.assertSendFails(['--strict'])