← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_bad_files.py

  • Committer: Robert Collins
  • Date: 2005-10-18 05:26:22 UTC
  • mto: This revision was merged to the branch mainline in revision 1463.
  • Revision ID: robertc@robertcollins.net-20051018052622-653d638c9e26fde4
fix broken tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_bad_files.py
18
18
"""Tests being able to ignore mad filetypes.
19
19
"""
20
20
 
21
 
from bzrlib.tests import TestCaseWithTransport
 
21
from bzrlib.selftest import TestCaseInTempDir
22
22
from bzrlib.errors import BadFileKindError
23
23
import os
24
24
 
25
 
def verify_status(tester, tree, value):
26
 
    from bzrlib.status import show_tree_status
 
25
def verify_status(tester, branch, value):
 
26
    from bzrlib.status import show_status
27
27
    from cStringIO import StringIO
28
28
 
29
29
    tof = StringIO()
30
 
    show_tree_status(tree, to_file=tof)
 
30
    show_status(branch, to_file=tof)
31
31
    tof.seek(0)
32
32
    tester.assertEquals(tof.readlines(), value)
33
33
 
34
34
 
35
 
class TestBadFiles(TestCaseWithTransport):
 
35
class TestBadFiles(TestCaseInTempDir):
36
36
    
37
37
    def test_bad_files(self): 
38
38
        """Test that bzr will ignore files it doesn't like"""
39
 
        from bzrlib.add import smart_add_tree
 
39
        from bzrlib.commit import commit
 
40
        from bzrlib.add import smart_add
40
41
        from bzrlib.branch import Branch
41
42
 
42
 
        wt = self.make_branch_and_tree('.')
43
 
        b = wt.branch
 
43
        b = Branch.initialize('.')
44
44
 
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")
 
45
        self.build_tree(['one', 'two', 'three'])
 
46
        smart_add('.')
 
47
        commit(b, "Commit one", rev_id="a@u-0-0")
49
48
        self.build_tree(['four'])
50
 
        wt.add(['four'])
51
 
        wt.commit("Commit two", rev_id="a@u-0-1")
 
49
        smart_add('.')
 
50
        commit(b, "Commit two", rev_id="a@u-0-1")
52
51
        self.build_tree(['five'])
53
 
        wt.add(['five'])
54
 
        wt.commit("Commit three", rev_id="a@u-0-2")
 
52
        smart_add('.')
 
53
        commit(b, "Commit three", rev_id="a@u-0-2")
55
54
 
56
55
        # We should now have a few files, lets try to
57
56
        # put some bogus stuff in the tree
61
60
            return
62
61
 
63
62
        # status with nothing
64
 
        verify_status(self, wt, [])
 
63
        verify_status(self, b, [])
65
64
 
66
65
        os.mkfifo('a-fifo')
67
66
        self.build_tree(['six'])
68
67
 
69
 
        verify_status(self, wt,
 
68
        verify_status(self, b,
70
69
                          ['unknown:\n',
71
70
                           '  a-fifo\n',
72
71
                           '  six\n'
74
73
        
75
74
        # Make sure smart_add can handle having a bogus
76
75
        # file in the way
77
 
        smart_add_tree(wt, '.')
78
 
        verify_status(self, wt,
 
76
        smart_add('.')
 
77
        verify_status(self, b,
79
78
                          ['added:\n',
80
79
                           '  six\n',
81
80
                           'unknown:\n',
82
81
                           '  a-fifo\n',
83
82
                           ])
84
 
        wt.commit("Commit four", rev_id="a@u-0-3")
 
83
        commit(b, "Commit four", rev_id="a@u-0-3")
85
84
 
86
 
        verify_status(self, wt,
 
85
        verify_status(self, b,
87
86
                          ['unknown:\n',
88
87
                           '  a-fifo\n',
89
88
                           ])
90
89
 
91
90
        # We should raise an error if we are adding a bogus file
92
91
        # Is there a way to test the actual error that should be raised?
93
 
        self.run_bzr('add', 'a-fifo', retcode=3)
 
92
        self.run_bzr('add', 'a-fifo', retcode=1)
94
93