← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_hashcache.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_hashcache.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2009, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
 
import sha
19
18
import stat
20
 
import sys
21
19
import time
22
20
 
 
21
from bzrlib import osutils
23
22
from bzrlib.errors import BzrError
24
23
from bzrlib.hashcache import HashCache
25
 
from bzrlib.tests import OsFifoFeature, TestCaseInTempDir, TestCase
 
24
from bzrlib.tests import (
 
25
    OsFifoFeature,
 
26
    TestCaseInTempDir,
 
27
    )
26
28
 
27
29
 
28
30
def sha1(t):
29
 
    return sha.new(t).hexdigest()
 
31
    return osutils.sha(t).hexdigest()
30
32
 
31
33
 
32
34
def pause():
146
148
                10, 20,
147
149
                stat.S_IFREG | 0600)
148
150
 
149
 
    def _really_sha1_file(self, abspath):
 
151
    def _really_sha1_file(self, abspath, filters):
150
152
        if abspath in self._files:
151
153
            return sha1(self._files[abspath][0])
152
154
        else:
158
160
    def pretend_to_sleep(self, secs):
159
161
        self._clock += secs
160
162
 
161
 
    
 
163
 
162
164
class TestHashCacheFakeFilesystem(TestCaseInTempDir):
163
165
    """Tests the hashcache using a simulated OS.
164
166
    """
173
175
        self.assertEquals(hc.get_sha1('foo'), sha1('hello'))
174
176
        self.assertEquals(hc.miss_count, 1)
175
177
        self.assertEquals(hc.hit_count, 0)
176
 
        # if we try again it's still too new; 
 
178
        # if we try again it's still too new;
177
179
        self.assertEquals(hc.get_sha1('foo'), sha1('hello'))
178
180
        self.assertEquals(hc.miss_count, 2)
179
181
        self.assertEquals(hc.hit_count, 0)