/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 breezy/tests/test_fifo_cache.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_fifo_cache.py
16
16
 
17
17
"""Tests for the fifo_cache module."""
18
18
 
19
 
from bzrlib import (
 
19
from .. import (
20
20
    fifo_cache,
21
21
    tests,
22
22
    )
 
23
from ..sixish import (
 
24
    viewitems,
 
25
    viewkeys,
 
26
    viewvalues,
 
27
    )
23
28
 
24
29
 
25
30
class TestFIFOCache(tests.TestCase):
33
38
        self.assertEqual(2, c[1])
34
39
        self.assertEqual(2, c.get(1))
35
40
        self.assertEqual(2, c.get(1, None))
36
 
        self.assertEqual([1], c.keys())
37
 
        self.assertEqual([1], list(c.iterkeys()))
38
 
        self.assertEqual([(1, 2)], c.items())
39
 
        self.assertEqual([(1, 2)], list(c.iteritems()))
40
 
        self.assertEqual([2], c.values())
41
 
        self.assertEqual([2], list(c.itervalues()))
 
41
        self.assertEqual([1], list(c))
 
42
        self.assertEqual({1}, viewkeys(c))
 
43
        self.assertEqual([(1, 2)], sorted(viewitems(c)))
 
44
        self.assertEqual([2], sorted(viewvalues(c)))
42
45
        self.assertEqual({1: 2}, c)
43
46
 
44
47
    def test_cache_size(self):
54
57
        self.assertEqual(0, len(c))
55
58
        self.assertEqual(None, c.get(1))
56
59
        self.assertEqual(None, c.get(1, None))
57
 
        self.assertEqual([], c.keys())
58
 
        self.assertEqual([], list(c.iterkeys()))
59
 
        self.assertEqual([], c.items())
60
 
        self.assertEqual([], list(c.iteritems()))
61
 
        self.assertEqual([], c.values())
62
 
        self.assertEqual([], list(c.itervalues()))
 
60
        self.assertEqual([], list(c))
 
61
        self.assertEqual(set(), viewkeys(c))
 
62
        self.assertEqual([], list(viewitems(c)))
 
63
        self.assertEqual([], list(viewvalues(c)))
63
64
        self.assertEqual({}, c)
64
65
 
65
66
    def test_add_maintains_fifo(self):
68
69
        c[2] = 3
69
70
        c[3] = 4
70
71
        c[4] = 5
71
 
        self.assertEqual([1, 2, 3, 4], sorted(c.keys()))
 
72
        self.assertEqual({1, 2, 3, 4}, viewkeys(c))
72
73
        c[5] = 6
73
74
        # This should pop out the oldest entry
74
 
        self.assertEqual([2, 3, 4, 5], sorted(c.keys()))
 
75
        self.assertEqual({2, 3, 4, 5}, viewkeys(c))
75
76
        # Replacing an item doesn't change the stored keys
76
77
        c[2] = 7
77
 
        self.assertEqual([2, 3, 4, 5], sorted(c.keys()))
 
78
        self.assertEqual({2, 3, 4, 5}, viewkeys(c))
78
79
        # But it does change the position in the FIFO
79
80
        c[6] = 7
80
 
        self.assertEqual([2, 4, 5, 6], sorted(c.keys()))
 
81
        self.assertEqual({2, 4, 5, 6}, viewkeys(c))
81
82
        self.assertEqual([4, 5, 2, 6], list(c._queue))
82
83
 
83
84
    def test_default_after_cleanup_count(self):
89
90
        c[4] = 5
90
91
        c[5] = 6
91
92
        # So far, everything fits
92
 
        self.assertEqual([1, 2, 3, 4, 5], sorted(c.keys()))
 
93
        self.assertEqual({1, 2, 3, 4, 5}, viewkeys(c))
93
94
        c[6] = 7
94
95
        # But adding one more should shrink down to after_cleanup_count
95
 
        self.assertEqual([3, 4, 5, 6], sorted(c.keys()))
 
96
        self.assertEqual({3, 4, 5, 6}, viewkeys(c))
96
97
 
97
98
    def test_clear(self):
98
99
        c = fifo_cache.FIFOCache(5)
102
103
        c[4] = 5
103
104
        c[5] = 6
104
105
        c.cleanup()
105
 
        self.assertEqual([2, 3, 4, 5], sorted(c.keys()))
 
106
        self.assertEqual({2, 3, 4, 5}, viewkeys(c))
106
107
        c.clear()
107
 
        self.assertEqual([], c.keys())
 
108
        self.assertEqual(set(), viewkeys(c))
108
109
        self.assertEqual([], list(c._queue))
109
110
        self.assertEqual({}, c)
110
111
 
229
230
        c = fifo_cache.FIFOCache()
230
231
        c.add(1, 2, cleanup=logging_cleanup)
231
232
        del c
232
 
        # TODO: We currently don't support calling the cleanup() funcs during
233
 
        #       __del__. We might want to consider implementing this.
234
 
        self.expectFailure("we don't call cleanups during __del__",
235
 
                           self.assertEqual, [(1, 2)], log)
236
 
        self.assertEqual([(1, 2)], log)
 
233
        # As a matter of design, bzr does not (can not) count on anything
 
234
        # being run from Python __del__ methods, because they may not run for
 
235
        # a long time, and because in cPython merely having them defined
 
236
        # interferes with garbage collection.
 
237
        self.assertEqual([], log)
237
238
 
238
239
 
239
240
class TestFIFOSizeCache(tests.TestCase):
246
247
        self.assertEqual('2', c[1])
247
248
        self.assertEqual('2', c.get(1))
248
249
        self.assertEqual('2', c.get(1, None))
249
 
        self.assertEqual([1], c.keys())
250
 
        self.assertEqual([1], list(c.iterkeys()))
251
 
        self.assertEqual([(1, '2')], c.items())
252
 
        self.assertEqual([(1, '2')], list(c.iteritems()))
253
 
        self.assertEqual(['2'], c.values())
254
 
        self.assertEqual(['2'], list(c.itervalues()))
 
250
        self.assertEqual([1], list(c))
 
251
        self.assertEqual({1}, viewkeys(c))
 
252
        self.assertEqual([(1, '2')], sorted(viewitems(c)))
 
253
        self.assertEqual(['2'], sorted(viewvalues(c)))
255
254
        self.assertEqual({1: '2'}, c)
256
255
        self.assertEqual(1024*1024, c.cache_size())
257
256
 
262
261
        self.assertEqual(0, len(c))
263
262
        self.assertEqual(None, c.get(1))
264
263
        self.assertEqual(None, c.get(1, None))
265
 
        self.assertEqual([], c.keys())
266
 
        self.assertEqual([], list(c.iterkeys()))
267
 
        self.assertEqual([], c.items())
268
 
        self.assertEqual([], list(c.iteritems()))
269
 
        self.assertEqual([], c.values())
270
 
        self.assertEqual([], list(c.itervalues()))
 
264
        self.assertEqual([], list(c))
 
265
        self.assertEqual(set(), viewkeys(c))
 
266
        self.assertEqual([], list(viewitems(c)))
 
267
        self.assertEqual([], list(viewvalues(c)))
271
268
        self.assertEqual({}, c)
272
269
 
273
270
    def test_add_maintains_fifo(self):