← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ignores.py

Merge cleanup into description

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ignores.py
34
34
                '\n' # empty line
35
35
                '#comment\n'
36
36
                ' xx \n' # whitespace
 
37
                '!RE:^\.z.*\n'
 
38
                '!!./.zcompdump\n'
37
39
                ))
38
40
        self.assertEqual(set(['./rootdir',
39
41
                          'randomfile*',
41
43
                          u'unicode\xb5',
42
44
                          'dos',
43
45
                          ' xx ',
 
46
                          '!RE:^\.z.*',
 
47
                          '!!./.zcompdump',
44
48
                         ]), ignored)
45
49
 
46
50
    def test_parse_empty(self):
128
132
    def setUp(self):
129
133
        TestCase.setUp(self)
130
134
 
131
 
        orig = ignores._runtime_ignores
132
 
        def restore():
133
 
            ignores._runtime_ignores = orig
134
 
        self.addCleanup(restore)
135
135
        # For the purposes of these tests, we must have no
136
136
        # runtime ignores
137
 
        ignores._runtime_ignores = set()
 
137
        self.overrideAttr(ignores, '_runtime_ignores', set())
138
138
 
139
139
    def test_add(self):
140
140
        """Test that we can add an entry to the list."""