← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lazy_regex.py

Merge cleanup into first-try resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lazy_regex.py
18
18
 
19
19
import re
20
20
 
 
21
from bzrlib import errors
21
22
from bzrlib import (
22
23
    lazy_regex,
23
24
    tests,
63
64
                          ('_real_re_compile', ('foo',), {}),
64
65
                         ], actions)
65
66
 
 
67
    def test_bad_pattern(self):
 
68
        """Ensure lazy regex handles bad patterns cleanly."""
 
69
        p = lazy_regex.lazy_compile('RE:[')
 
70
        # As p.match is lazy, we make it into a lambda so its handled
 
71
        # by assertRaises correctly.
 
72
        e = self.assertRaises(errors.InvalidPattern, lambda: p.match('foo'))
 
73
        self.assertEqual(e.msg, '"RE:[" unexpected end of regular expression')
 
74
 
66
75
 
67
76
class TestLazyCompile(tests.TestCase):
68
77