← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin
  • Date: 2010-06-22 00:32:37 UTC
  • mto: This revision was merged to the branch mainline in revision 5315.
  • Revision ID: gzlist@googlemail.com-20100622003237-zntnpyx8hjb5jnpw
Change interface of _command_line_to_argv so old tests can still be used with new stripping logic

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
19
19
 
20
20
from itertools import izip
21
21
import os
 
22
import re
22
23
 
23
24
from bzrlib import (
24
25
    branchbuilder,
28
29
    tests,
29
30
    )
30
31
from bzrlib.tests import (
 
32
    script,
31
33
    test_log,
32
34
    )
33
35
 
156
158
        self.make_linear_branch()
157
159
        self.assertLogRevnos(['-c1'], ['1'])
158
160
 
159
 
    def test_branch_revspec(self):
160
 
        foo = self.make_branch_and_tree('foo')
161
 
        bar = self.make_branch_and_tree('bar')
162
 
        self.build_tree(['foo/foo.txt', 'bar/bar.txt'])
163
 
        foo.add('foo.txt')
164
 
        bar.add('bar.txt')
165
 
        foo.commit(message='foo')
166
 
        bar.commit(message='bar')
167
 
        self.run_bzr('log -r branch:../bar', working_dir='foo')
168
 
        self.assertEqual([bar.branch.get_rev_id(1)],
169
 
                         [r.rev.revision_id
170
 
                          for r in self.get_captured_revisions()])
171
 
 
172
161
 
173
162
class TestLogExcludeCommonAncestry(TestLogWithLogCatcher):
174
163
 
379
368
 
380
369
    def test_log_bad_message_re(self):
381
370
        """Bad --message argument gives a sensible message
382
 
 
 
371
        
383
372
        See https://bugs.launchpad.net/bzr/+bug/251352
384
373
        """
385
374
        self.make_minimal_branch()
386
375
        out, err = self.run_bzr(['log', '-m', '*'], retcode=3)
387
 
        self.assertContainsRe(err, "ERROR.*Invalid pattern.*nothing to repeat")
388
 
        self.assertNotContainsRe(err, "Unprintable exception")
389
 
        self.assertEqual(out, '')
 
376
        self.assertEqual("bzr: ERROR: Invalid regular expression"
 
377
            " in log message filter"
 
378
            ": '*'"
 
379
            ": nothing to repeat\n", err)
 
380
        self.assertEqual('', out)
390
381
 
391
382
    def test_log_unsupported_timezone(self):
392
383
        self.make_linear_branch()
922
913
        self.prepare_tree()
923
914
        os.chdir("dir1")
924
915
        self.assertLogRevnos(['dir2', 'file5'], ['5', '3'])
925
 
 
926
 
 
927
 
class MainlineGhostTests(TestLogWithLogCatcher):
928
 
 
929
 
    def setUp(self):
930
 
        super(MainlineGhostTests, self).setUp()
931
 
        tree = self.make_branch_and_tree('')
932
 
        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
933
 
        tree.add('')
934
 
        tree.commit('msg1', rev_id='rev1')
935
 
        tree.commit('msg2', rev_id='rev2')
936
 
 
937
 
    def test_log_range(self):
938
 
        self.assertLogRevnos(["-r1..2"], ["2", "1"])
939
 
 
940
 
    def test_log_norange(self):
941
 
        self.assertLogRevnos([], ["2", "1"])
942
 
 
943
 
    def test_log_range_open_begin(self):
944
 
        raise tests.KnownFailure("log with ghosts fails. bug #726466")
945
 
        (stdout, stderr) = self.run_bzr(['log', '-r..2'], retcode=3)
946
 
        self.assertEqual(["2", "1"],
947
 
                         [r.revno for r in self.get_captured_revisions()])
948
 
        self.assertEquals("bzr: ERROR: Further revision history missing.", stderr)
949
 
 
950
 
    def test_log_range_open_end(self):
951
 
        self.assertLogRevnos(["-r1.."], ["2", "1"])