~bzr-pqm/bzr/bzr.dev

5273.1.8 by Vincent Ladeuil
Merge bzr.dev into cleanup
1
# Copyright (C) 2006, 2009, 2010 Canonical Ltd
1713.3.1 by Robert Collins
Smoke tests for tree.list_files and bzr ignored when a versioned file matches an ignore rule.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1713.3.1 by Robert Collins
Smoke tests for tree.list_files and bzr ignored when a versioned file matches an ignore rule.
16
#
17
18
"""Tests of the 'bzr ignored' command."""
19
5283.4.5 by Martin Pool
Update remaining subclasses of ExternalBase
20
from bzrlib.tests import TestCaseWithTransport
21
22
23
class TestIgnored(TestCaseWithTransport):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
24
1713.3.1 by Robert Collins
Smoke tests for tree.list_files and bzr ignored when a versioned file matches an ignore rule.
25
    def test_ignored_added_file(self):
26
        """'bzr ignored' should not list versioned files."""
27
        # this test can go in favour of a more general ui test at some point
28
        # as it is actually testing the internals layer and should not be.
29
        # There are no other 'ignored' tests though, so it should be retained
30
        # until some are written.
31
        tree = self.make_branch_and_tree('.')
32
        self.build_tree(['foo.pyc'])
33
        # ensure that foo.pyc is ignored
34
        self.build_tree_contents([('.bzrignore', 'foo.pyc')])
35
        self.assertTrue(tree.is_ignored('foo.pyc'))
36
        # now add it and check the ui does not show it.
37
        tree.add('foo.pyc')
38
        out, err = self.run_bzr('ignored')
39
        self.assertEqual('', out)
40
        self.assertEqual('', err)
5171.3.7 by Martin von Gagern
Added blackbox tests for --directory option.
41
42
    def test_ignored_directory(self):
43
        """Test --directory option"""
44
        tree = self.make_branch_and_tree('a')
45
        self.build_tree_contents([('a/README', 'contents'),
46
                                  ('a/.bzrignore', 'README')])
47
        out, err = self.run_bzr(['ignored', '--directory=a'])
48
        self.assertStartsWith(out, 'README')