← 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 description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ignores.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006 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
34
34
                '\n' # empty line
35
35
                '#comment\n'
36
36
                ' xx \n' # whitespace
37
 
                '!RE:^\.z.*\n'
38
 
                '!!./.zcompdump\n'
39
37
                ))
40
38
        self.assertEqual(set(['./rootdir',
41
39
                          'randomfile*',
43
41
                          u'unicode\xb5',
44
42
                          'dos',
45
43
                          ' xx ',
46
 
                          '!RE:^\.z.*',
47
 
                          '!!./.zcompdump',
48
44
                         ]), ignored)
49
45
 
50
46
    def test_parse_empty(self):
132
128
    def setUp(self):
133
129
        TestCase.setUp(self)
134
130
 
 
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
 
        self.overrideAttr(ignores, '_runtime_ignores', set())
 
137
        ignores._runtime_ignores = set()
138
138
 
139
139
    def test_add(self):
140
140
        """Test that we can add an entry to the list."""