/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ignores.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-31 17:42:29 UTC
  • mto: This revision was merged to the branch mainline in revision 4611.
  • Revision ID: john@arbash-meinel.com-20090731174229-w2zdsdlfpeddk8gl
Now we got to the per-workingtree tests, etc.

The main causes seem to break down into:
  bzrdir.clone() is known to be broken wrt locking, this effects
  everything that tries to 'push'

  shelf code is not compatible with strict locking

  merge code seems to have an issue. This might actually be the
  root cause of the clone() problems.

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):
51
47
        ignored = ignores.parse_ignore_file(StringIO(''))
52
48
        self.assertEqual(set([]), ignored)
53
 
        
54
 
    def test_parse_non_utf8(self):
55
 
        """Lines with non utf 8 characters should be discarded."""
56
 
        ignored = ignores.parse_ignore_file(StringIO(
57
 
                'utf8filename_a\n'
58
 
                'invalid utf8\x80\n'
59
 
                'utf8filename_b\n'
60
 
                ))
61
 
        self.assertEqual(set([
62
 
                        'utf8filename_a',
63
 
                        'utf8filename_b',
64
 
                       ]), ignored)
65
49
 
66
50
 
67
51
class TestUserIgnores(TestCaseInTempDir):
144
128
    def setUp(self):
145
129
        TestCase.setUp(self)
146
130
 
 
131
        orig = ignores._runtime_ignores
 
132
        def restore():
 
133
            ignores._runtime_ignores = orig
 
134
        self.addCleanup(restore)
147
135
        # For the purposes of these tests, we must have no
148
136
        # runtime ignores
149
 
        self.overrideAttr(ignores, '_runtime_ignores', set())
 
137
        ignores._runtime_ignores = set()
150
138
 
151
139
    def test_add(self):
152
140
        """Test that we can add an entry to the list."""