1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
# Copyright (C) 2006-2010 Canonical Ltd
# -*- coding: utf-8 -*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Black-box tests for 'bzr added', which shows newly-added files."""
import os
from bzrlib.branch import Branch
from bzrlib.tests import TestCaseWithTransport
class TestAdded(TestCaseWithTransport):
def test_added(self):
"""Test that 'added' command reports added files"""
self._test_added('a', 'a\n')
def test_added_with_spaces(self):
"""Test that 'added' command reports added files with spaces in their names quoted"""
self._test_added('a filename with spaces', '"a filename with spaces"\n')
def test_added_null_separator(self):
"""Test that added uses its null operator properly"""
self._test_added('a', 'a\0', null=True)
def _test_added(self, name, output, null=False):
def check_added(expected, null=False):
command = 'added'
if null:
command += ' --null'
out, err = self.run_bzr(command)
self.assertEquals(out, expected)
self.assertEquals(err, '')
# in empty directory, nothing added
tree = self.make_branch_and_tree('.')
check_added('')
# with unknown file, still nothing added
self.build_tree_contents([(name, 'contents of %s\n' % (name))])
check_added('')
# after add, shows up in list
# bug report 20060119 by Nathan McCallum -- 'bzr added' causes
# NameError
tree.add(name)
check_added(output, null)
# after commit, now no longer listed
tree.commit(message='add "%s"' % (name))
check_added('')
def test_added_directory(self):
"""Test --directory option"""
tree = self.make_branch_and_tree('a')
self.build_tree(['a/README'])
tree.add('README')
out, err = self.run_bzr(['added', '--directory=a'])
self.assertEquals('README\n', out)
|
