← 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: Andrew Bennetts
  • Date: 2009-07-27 08:02:52 UTC
  • mto: This revision was merged to the branch mainline in revision 4573.
  • Revision ID: andrew.bennetts@canonical.com-20090727080252-1r4s9oqwlkzgywx7
Fix trivial bug in _vfs_set_tags_bytes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2008, 2009 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
30
 
from bzrlib.tests import (
31
 
    scenarios,
32
 
    script,
33
 
    )
34
 
 
35
 
 
36
 
load_tests = scenarios.load_tests_apply_scenarios
 
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
37
53
 
38
54
 
39
55
class TestSendMixin(object):
51
67
 
52
68
    def get_MD(self, args, cmd=None, wd='branch'):
53
69
        out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
54
 
        return merge_directive.MergeDirective.from_lines(out)
 
70
        return merge_directive.MergeDirective.from_lines(out.readlines())
55
71
 
56
72
    def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
57
73
        md = self.get_MD(args, cmd=cmd, wd=wd)
264
280
        self.assertEqual('rev3', md.revision_id)
265
281
 
266
282
    def test_nonexistant_branch(self):
267
 
        self.vfs_transport_factory = memory.MemoryServer
268
 
        location = self.get_url('absentdir/')
 
283
        if sys.platform == "win32":
 
284
            location = "C:/i/do/not/exist/"
 
285
        else:
 
286
            location = "/i/do/not/exist/"
269
287
        out, err = self.run_bzr(["send", "--from", location], retcode=3)
270
288
        self.assertEqual(out, '')
271
289
        self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
290
308
    _default_sent_revs = ['local']
291
309
    _default_errors = ['Working tree ".*/local/" has uncommitted '
292
310
                       'changes \(See bzr status\)\.',]
293
 
    _default_additional_error = 'Use --no-strict to force the send.\n'
294
 
    _default_additional_warning = 'Uncommitted changes will not be sent.'
295
311
 
296
312
    def set_config_send_strict(self, value):
297
313
        # set config var (any of bazaar.conf, locations.conf, branch.conf
300
316
        conf.set_user_option('send_strict', value)
301
317
 
302
318
    def assertSendFails(self, args):
303
 
        out, err = self.run_send(args, rc=3, err_re=self._default_errors)
304
 
        self.assertContainsRe(err, self._default_additional_error)
 
319
        self.run_send(args, rc=3, err_re=self._default_errors)
305
320
 
306
 
    def assertSendSucceeds(self, args, revs=None, with_warning=False):
307
 
        if with_warning:
308
 
            err_re = self._default_errors
309
 
        else:
310
 
            err_re = []
 
321
    def assertSendSucceeds(self, args, revs=None):
311
322
        if revs is None:
312
323
            revs = self._default_sent_revs
313
 
        out, err = self.run_send(args, err_re=err_re)
314
 
        bundling_revs = 'Bundling %d revision(s).\n' % len(revs)
315
 
        if with_warning:
316
 
            self.assertContainsRe(err, self._default_additional_warning)
317
 
            self.assertEndsWith(err, bundling_revs)
318
 
        else:
319
 
            self.assertEquals(bundling_revs, err)
320
 
        md = merge_directive.MergeDirective.from_lines(StringIO(out))
 
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())
321
329
        self.assertEqual('parent', md.base_revision_id)
322
330
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
323
331
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
349
357
 
350
358
 
351
359
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
352
 
                                TestSendStrictMixin):
353
 
 
354
 
    # These are textually the same as test_push.strict_push_change_scenarios,
355
 
    # but since the functions are reimplemented here, the definitions are left
356
 
    # here too.
357
 
    scenarios = [
358
 
        ('uncommitted',
359
 
         dict(_changes_type='_uncommitted_changes')),
360
 
        ('pending_merges',
361
 
         dict(_changes_type='_pending_merges')),
362
 
        ('out-of-sync-trees',
363
 
         dict(_changes_type='_out_of_sync_trees')),
364
 
        ]
 
360
                                   TestSendStrictMixin):
365
361
 
366
362
    _changes_type = None # Set by load_tests
367
363
 
402
398
        self._default_sent_revs = ['modified-in-local', 'local']
403
399
 
404
400
    def test_send_default(self):
405
 
        self.assertSendSucceeds([], with_warning=True)
 
401
        self.assertSendFails([])
406
402
 
407
403
    def test_send_with_revision(self):
408
404
        self.assertSendSucceeds(['-r', 'revid:local'], revs=['local'])
418
414
        self.assertSendFails([])
419
415
        self.assertSendSucceeds(['--no-strict'])
420
416
 
 
417
 
421
418
    def test_send_bogus_config_var_ignored(self):
422
419
        self.set_config_send_strict("I'm unsure")
423
 
        self.assertSendSucceeds([], with_warning=True)
 
420
        self.assertSendFails([])
 
421
 
424
422
 
425
423
    def test_send_no_strict_command_line_override_config(self):
426
424
        self.set_config_send_strict('true')
427
425
        self.assertSendFails([])
428
426
        self.assertSendSucceeds(['--no-strict'])
429
427
 
430
 
    def test_send_strict_command_line_override_config(self):
 
428
    def test_push_strict_command_line_override_config(self):
431
429
        self.set_config_send_strict('false')
432
430
        self.assertSendSucceeds([])
433
431
        self.assertSendFails(['--strict'])