← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

terminal_width can now returns None.

* bzrlib/win32utils.py:
(get_console_size): Fix typo in comment.

* bzrlib/ui/text.py:
(TextProgressView._show_line): Handle the no terminal present case.

* bzrlib/tests/test_osutils.py:
(TestTerminalWidth): Update tests.

* bzrlib/tests/blackbox/test_too_much.py:
Fix some imports.
(OldTests.test_bzr): Handle the no terminal present case.

* bzrlib/tests/__init__.py:
(VerboseTestResult.report_test_start): Handle the no terminal
present case.

* bzrlib/status.py:
(show_pending_merges): Handle the no terminal present case.
(show_pending_merges.show_log_message): Factor out some
code. Handle the no terminal present case.

* bzrlib/osutils.py:
(terminal_width): Return None if no precise value can be found.

* bzrlib/log.py:
(LineLogFormatter.__init__): Handle the no terminal present case.
(LineLogFormatter.truncate): Accept None as max_len meaning no
truncation.
(LineLogFormatter.log_string): 

* bzrlib/help.py:
(_help_commands_to_text): Handle the no terminal present case.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import (
23
 
    osutils,
24
 
    tests,
25
 
    )
 
22
from bzrlib import osutils
26
23
from bzrlib.tests import (
27
 
    script,
 
24
    condition_isinstance,
 
25
    split_suite_by_condition,
 
26
    multiply_tests,
 
27
    SymlinkFeature
28
28
    )
29
 
from bzrlib.tests.scenarios import load_tests_apply_scenarios
30
 
 
31
 
 
32
 
load_tests = load_tests_apply_scenarios
33
 
 
34
 
 
35
 
class TestAdd(tests.TestCaseWithTransport):
36
 
 
 
29
from bzrlib.tests.blackbox import ExternalBase
 
30
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
 
31
 
 
32
 
 
33
def load_tests(standard_tests, module, loader):
 
34
    """Parameterize tests for view-aware vs not."""
 
35
    to_adapt, result = split_suite_by_condition(
 
36
        standard_tests, condition_isinstance(TestAdd))
37
37
    scenarios = [
38
38
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
39
 
        ('view-aware', {'branch_tree_format': '2a'}),
 
39
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
40
40
        ]
 
41
    return multiply_tests(to_adapt, scenarios, result)
 
42
 
 
43
 
 
44
class TestAdd(ExternalBase):
41
45
 
42
46
    def make_branch_and_tree(self, dir):
43
 
        return super(TestAdd, self).make_branch_and_tree(
44
 
            dir, format=self.branch_tree_format)
 
47
        return ExternalBase.make_branch_and_tree(self, dir,
 
48
            format=self.branch_tree_format)
45
49
 
46
50
    def test_add_reports(self):
47
51
        """add command prints the names of added files."""
112
116
 
113
117
        eq = self.assertEqual
114
118
        ass = self.assertTrue
 
119
        chdir = os.chdir
115
120
 
116
121
        t = self.make_branch_and_tree('.')
117
122
        b = t.branch
126
131
 
127
132
        # add with no arguments in a subdirectory gets only files below that
128
133
        # subdirectory
129
 
        self.run_bzr('add', working_dir='src')
130
 
        self.assertEquals('README\n',
131
 
                          self.run_bzr('unknowns', working_dir='src')[0])
 
134
        chdir('src')
 
135
        self.run_bzr('add')
 
136
        self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
132
137
        # reopen to see the new changes
133
 
        t = t.bzrdir.open_workingtree('src')
 
138
        t = t.bzrdir.open_workingtree()
134
139
        versioned = [path for path, entry in t.iter_entries_by_dir()]
135
 
        self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
 
140
        self.assertEquals(versioned,
 
141
            ['', 'src', 'src/foo.c'])
136
142
 
137
143
        # add from the parent directory should pick up all file names
 
144
        chdir('..')
138
145
        self.run_bzr('add')
139
146
        self.assertEquals(self.run_bzr('unknowns')[0], '')
140
147
        self.run_bzr('check')
204
211
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
205
212
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
206
213
 
 
214
    def test_add_with_wildcards(self):
 
215
        self.requireFeature(NeedsGlobExpansionFeature)
 
216
        self.make_branch_and_tree('.')
 
217
        self.build_tree(['a1', 'a2', 'b', 'c33'])
 
218
        self.run_bzr(['add', 'a?', 'c*'])
 
219
        self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
 
220
 
 
221
    def test_add_with_wildcards_unicode(self):
 
222
        self.requireFeature(NeedsGlobExpansionFeature)
 
223
        self.make_branch_and_tree('.')
 
224
        self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
 
225
        self.run_bzr(['add', u'\u1234?', u'\u1235*'])
 
226
        self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
 
227
 
207
228
    def test_add_via_symlink(self):
208
 
        self.requireFeature(tests.SymlinkFeature)
 
229
        self.requireFeature(SymlinkFeature)
209
230
        self.make_branch_and_tree('source')
210
231
        self.build_tree(['source/top.txt'])
211
232
        os.symlink('source', 'link')
213
234
        self.assertEquals(out, 'adding top.txt\n')
214
235
 
215
236
    def test_add_symlink_to_abspath(self):
216
 
        self.requireFeature(tests.SymlinkFeature)
 
237
        self.requireFeature(SymlinkFeature)
217
238
        self.make_branch_and_tree('tree')
218
239
        os.symlink(osutils.abspath('target'), 'tree/link')
219
240
        out = self.run_bzr(['add', 'tree/link'])[0]
220
241
        self.assertEquals(out, 'adding link\n')
221
 
 
222
 
    def test_add_not_child(self):
223
 
        # https://bugs.launchpad.net/bzr/+bug/98735
224
 
        sr = script.ScriptRunner()
225
 
        self.make_branch_and_tree('tree1')
226
 
        self.make_branch_and_tree('tree2')
227
 
        self.build_tree(['tree1/a', 'tree2/b'])
228
 
        sr.run_script(self, '''
229
 
        $ bzr add tree1/a tree2/b
230
 
        2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
231
 
        ''')
232
 
 
233
 
    def test_add_multiple_files_in_unicode_cwd(self):
234
 
        """Adding multiple files in a non-ascii cwd, see lp:686611"""
235
 
        self.requireFeature(tests.UnicodeFilename)
236
 
        self.make_branch_and_tree(u"\xA7")
237
 
        self.build_tree([u"\xA7/a", u"\xA7/b"])
238
 
        out, err = self.run_bzr(["add", "a", "b"], working_dir=u"\xA7")
239
 
        self.assertEquals(out, "adding a\n" "adding b\n")
240
 
        self.assertEquals(err, "")