/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/tests/test_globbing.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
 
18
18
import re
19
19
 
20
 
from .. import errors
 
20
from .. import errors, lazy_regex
21
21
from ..globbing import (
22
22
    Globster,
23
23
    ExceptionGlobster,
316
316
        """Ensure that globster handles bad patterns cleanly."""
317
317
        patterns = [u'RE:[', u'/home/foo', u'RE:*.cpp']
318
318
        g = Globster(patterns)
319
 
        e = self.assertRaises(errors.InvalidPattern, g.match, 'filename')
 
319
        e = self.assertRaises(lazy_regex.InvalidPattern, g.match, 'filename')
320
320
        self.assertContainsRe(e.msg,
321
321
            "File.*ignore.*contains error.*RE:\[.*RE:\*\.cpp", flags=re.DOTALL)
322
322