← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_globbing.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-08-02 23:49:34 UTC
  • mfrom: (5362.1.1 merge-2.2-into-trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20100802234934-d963xmqwx5gzevr0
(Andrew Bennetts) Merge 2.2 branch back into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_globbing.py
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
 
18
import re
 
19
 
18
20
from bzrlib import errors
19
21
from bzrlib.globbing import (
20
22
    Globster,
311
313
 
312
314
    def test_bad_pattern(self):
313
315
        """Ensure that globster handles bad patterns cleanly."""
314
 
        patterns = [u'RE:[']
 
316
        patterns = [u'RE:[', u'/home/foo', u'RE:*.cpp']
315
317
        g = Globster(patterns)
316
 
        e = self.assertRaises(errors.InvalidPattern, g.match, 'foo')
317
 
        self.assertContainsRe(e.msg, "File.*ignore.*contains errors")
 
318
        e = self.assertRaises(errors.InvalidPattern, g.match, 'filename')
 
319
        self.assertContainsRe(e.msg,
 
320
            "File.*ignore.*contains error.*RE:\[.*RE:\*\.cpp", flags=re.DOTALL)
318
321
 
319
322
 
320
323
class TestExceptionGlobster(TestCase):