← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bad_files.py

(robertc) Deprecate WorkingTree.pending_merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bad_files.py
1
1
# Copyright (C) 2005 by 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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
18
"""Tests being able to ignore mad filetypes.
19
19
"""
20
20
 
21
 
from bzrlib.tests import TestCaseInTempDir
 
21
from bzrlib.tests import TestCaseWithTransport
22
22
from bzrlib.errors import BadFileKindError
23
23
import os
24
24
 
25
 
def verify_status(tester, branch, value):
26
 
    from bzrlib.status import show_status
 
25
def verify_status(tester, tree, value):
 
26
    from bzrlib.status import show_tree_status
27
27
    from cStringIO import StringIO
28
28
 
29
29
    tof = StringIO()
30
 
    show_status(branch, to_file=tof)
 
30
    show_tree_status(tree, to_file=tof)
31
31
    tof.seek(0)
32
32
    tester.assertEquals(tof.readlines(), value)
33
33
 
34
34
 
35
 
class TestBadFiles(TestCaseInTempDir):
 
35
class TestBadFiles(TestCaseWithTransport):
36
36
    
37
 
    def test_bad_files(self): 
 
37
    def test_bad_files(self):
38
38
        """Test that bzr will ignore files it doesn't like"""
39
 
        from bzrlib.commit import commit
40
 
        from bzrlib.add import smart_add
 
39
        from bzrlib.add import smart_add_tree
41
40
        from bzrlib.branch import Branch
42
41
 
43
 
        b = Branch.initialize(u'.')
 
42
        wt = self.make_branch_and_tree('.')
 
43
        b = wt.branch
44
44
 
45
 
        self.build_tree(['one', 'two', 'three'])
46
 
        smart_add(u'.')
47
 
        commit(b, "Commit one", rev_id="a@u-0-0")
 
45
        files = ['one', 'two', 'three']
 
46
        self.build_tree(files)
 
47
        wt.add(files)
 
48
        wt.commit("Commit one", rev_id="a@u-0-0")
48
49
        self.build_tree(['four'])
49
 
        smart_add(u'.')
50
 
        commit(b, "Commit two", rev_id="a@u-0-1")
 
50
        wt.add(['four'])
 
51
        wt.commit("Commit two", rev_id="a@u-0-1")
51
52
        self.build_tree(['five'])
52
 
        smart_add(u'.')
53
 
        commit(b, "Commit three", rev_id="a@u-0-2")
 
53
        wt.add(['five'])
 
54
        wt.commit("Commit three", rev_id="a@u-0-2")
54
55
 
55
56
        # We should now have a few files, lets try to
56
57
        # put some bogus stuff in the tree
57
58
 
58
59
        # We can only continue if we have mkfifo
59
60
        if not hasattr(os, 'mkfifo'):
 
61
            # TODO: Ultimately this should be TestSkipped
 
62
            # or PlatformDeficiency
60
63
            return
61
64
 
62
65
        # status with nothing
63
 
        verify_status(self, b, [])
 
66
        verify_status(self, wt, [])
64
67
 
65
68
        os.mkfifo('a-fifo')
66
69
        self.build_tree(['six'])
67
70
 
68
 
        verify_status(self, b,
 
71
        verify_status(self, wt,
69
72
                          ['unknown:\n',
70
73
                           '  a-fifo\n',
71
74
                           '  six\n'
73
76
        
74
77
        # Make sure smart_add can handle having a bogus
75
78
        # file in the way
76
 
        smart_add(u'.')
77
 
        verify_status(self, b,
 
79
        smart_add_tree(wt, '.')
 
80
        verify_status(self, wt,
78
81
                          ['added:\n',
79
82
                           '  six\n',
80
83
                           'unknown:\n',
81
84
                           '  a-fifo\n',
82
85
                           ])
83
 
        commit(b, "Commit four", rev_id="a@u-0-3")
 
86
        wt.commit("Commit four", rev_id="a@u-0-3")
84
87
 
85
 
        verify_status(self, b,
 
88
        verify_status(self, wt,
86
89
                          ['unknown:\n',
87
90
                           '  a-fifo\n',
88
91
                           ])