/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bad_files.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-22 14:12:22 UTC
  • mfrom: (5809 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110422141222-nx2j0hbkihcb8j16
Merge newer bzr.dev and resolve conflicts.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2011 Canonical Ltd
 
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
"""Tests being able to ignore bad filetypes."""
 
19
 
 
20
from cStringIO import StringIO
 
21
import os
 
22
 
 
23
from bzrlib import (
 
24
    errors,
 
25
    )
 
26
from bzrlib.status import show_tree_status
 
27
from bzrlib.tests import OsFifoFeature, TestCaseWithTransport
 
28
 
 
29
 
 
30
def verify_status(tester, tree, value):
 
31
    """Verify the output of show_tree_status"""
 
32
    tof = StringIO()
 
33
    show_tree_status(tree, to_file=tof)
 
34
    tof.seek(0)
 
35
    tester.assertEqual(value, tof.readlines())
 
36
 
 
37
 
 
38
class TestBadFiles(TestCaseWithTransport):
 
39
 
 
40
    def test_bad_files(self):
 
41
        """Test that bzr will ignore files it doesn't like"""
 
42
        self.requireFeature(OsFifoFeature)
 
43
 
 
44
        wt = self.make_branch_and_tree('.')
 
45
        b = wt.branch
 
46
 
 
47
        files = ['one', 'two', 'three']
 
48
        file_ids = ['one-id', 'two-id', 'three-id']
 
49
        self.build_tree(files)
 
50
        wt.add(files, file_ids)
 
51
        wt.commit("Commit one", rev_id="a@u-0-0")
 
52
 
 
53
        # We should now have a few files, lets try to
 
54
        # put some bogus stuff in the tree
 
55
 
 
56
        # status with nothing changed
 
57
        verify_status(self, wt, [])
 
58
 
 
59
        os.mkfifo('a-fifo')
 
60
        self.build_tree(['six'])
 
61
 
 
62
        verify_status(self, wt,
 
63
                          ['unknown:\n',
 
64
                           '  a-fifo\n',
 
65
                           '  six\n'
 
66
                           ])
 
67
 
 
68
        # We should raise an error if we are adding a bogus file
 
69
        self.assertRaises(errors.BadFileKindError, wt.smart_add, ['a-fifo'])
 
70
 
 
71
        # And the list of files shouldn't have been modified
 
72
        verify_status(self, wt,
 
73
                          ['unknown:\n',
 
74
                           '  a-fifo\n',
 
75
                           '  six\n'
 
76
                           ])
 
77
 
 
78
        # Make sure smart_add can handle having a bogus
 
79
        # file in the way
 
80
        wt.smart_add([])
 
81
        verify_status(self, wt,
 
82
                          ['added:\n',
 
83
                           '  six\n',
 
84
                           'unknown:\n',
 
85
                           '  a-fifo\n',
 
86
                           ])
 
87
        wt.commit("Commit four", rev_id="a@u-0-3")
 
88
 
 
89
        verify_status(self, wt,
 
90
                          ['unknown:\n',
 
91
                           '  a-fifo\n',
 
92
                           ])