← 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

  • Committer: Olaf Conradi
  • Date: 2006-03-28 23:30:02 UTC
  • mto: (1661.1.1 bzr.mbp.remember)
  • mto: This revision was merged to the branch mainline in revision 1663.
  • Revision ID: olaf@conradi.org-20060328233002-f6262df0e19c1963
Added testcases for using pull with --remember. Moved remember code to
beginning of cmd_pull. This remembers the location in case of a failure
during pull.

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
 
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
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
60
61
            return
61
62
 
62
63
        # status with nothing
63
 
        verify_status(self, b, [])
 
64
        verify_status(self, wt, [])
64
65
 
65
66
        os.mkfifo('a-fifo')
66
67
        self.build_tree(['six'])
67
68
 
68
 
        verify_status(self, b,
 
69
        verify_status(self, wt,
69
70
                          ['unknown:\n',
70
71
                           '  a-fifo\n',
71
72
                           '  six\n'
73
74
        
74
75
        # Make sure smart_add can handle having a bogus
75
76
        # file in the way
76
 
        smart_add('.')
77
 
        verify_status(self, b,
 
77
        smart_add_tree(wt, '.')
 
78
        verify_status(self, wt,
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
 
        verify_status(self, b,
 
86
        verify_status(self, wt,
86
87
                          ['unknown:\n',
87
88
                           '  a-fifo\n',
88
89
                           ])
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