← 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

[merge] jam-integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bad_files.py
18
18
"""Tests being able to ignore mad filetypes.
19
19
"""
20
20
 
21
 
from bzrlib.selftest import TestCaseInTempDir
 
21
from bzrlib.tests import TestCaseWithTransport
22
22
from bzrlib.errors import BadFileKindError
23
23
import os
24
24
 
32
32
    tester.assertEquals(tof.readlines(), value)
33
33
 
34
34
 
35
 
class TestBadFiles(TestCaseInTempDir):
 
35
class TestBadFiles(TestCaseWithTransport):
36
36
    
37
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('.')
 
42
        wt = self.make_branch_and_tree('.')
 
43
        b = wt.branch
44
44
 
45
 
        self.build_tree(['one', 'two', 'three'])
46
 
        smart_add('.')
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('.')
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('.')
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
73
74
        
74
75
        # Make sure smart_add can handle having a bogus
75
76
        # file in the way
76
 
        smart_add('.')
 
77
        smart_add_tree(wt, '.')
77
78
        verify_status(self, b,
78
79
                          ['added:\n',
79
80
                           '  six\n',
80
81
                           'unknown:\n',
81
82
                           '  a-fifo\n',
82
83
                           ])
83
 
        commit(b, "Commit four", rev_id="a@u-0-3")
 
84
        wt.commit("Commit four", rev_id="a@u-0-3")
84
85
 
85
86
        verify_status(self, b,
86
87
                          ['unknown:\n',
89
90
 
90
91
        # We should raise an error if we are adding a bogus file
91
92
        # Is there a way to test the actual error that should be raised?
92
 
        self.run_bzr('add', 'a-fifo', retcode=1)
 
93
        self.run_bzr('add', 'a-fifo', retcode=3)
93
94