/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_lazy_regex.py

  • Committer: John Arbash Meinel
  • Date: 2010-08-10 20:03:44 UTC
  • mto: This revision was merged to the branch mainline in revision 5376.
  • Revision ID: john@arbash-meinel.com-20100810200344-6muerwvkafqu7w47
Rework things a bit so the logic can be shared.

It turns out that some of the peak memory is actually during the inventory
to string to bundle translations. So re-use the refcount logic there.
This actually does show a decrease in peak memory.
Specifically 'cd bzr.dev; bzr send ../2.2' drops from 221MB peak to 156MB.

We don't speed anything up (16.5s both ways), but peak memory is quite
a bit better.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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