← 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: 2006-10-11 23:08:27 UTC
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: john@arbash-meinel.com-20061011230827-2bdfc45020695281
Change Copyright .. by Canonical to Copyright ... Canonical

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_hashcache.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
 
18
import sha
18
19
import stat
19
20
import sys
20
21
import time
21
22
 
22
 
from bzrlib import osutils
23
23
from bzrlib.errors import BzrError
24
24
from bzrlib.hashcache import HashCache
25
 
from bzrlib.tests import OsFifoFeature, TestCaseInTempDir, TestCase
 
25
from bzrlib.tests import TestCaseInTempDir, TestSkipped, TestCase
26
26
 
27
27
 
28
28
def sha1(t):
29
 
    return osutils.sha(t).hexdigest()
 
29
    return sha.new(t).hexdigest()
30
30
 
31
31
 
32
32
def pause():
111
111
 
112
112
    def test_hashcache_raise(self):
113
113
        """check that hashcache can raise BzrError"""
114
 
        self.requireFeature(OsFifoFeature)
115
114
        hc = self.make_hashcache()
 
115
        if getattr(os, 'mkfifo', None) is None:
 
116
            raise TestSkipped('filesystem fifos not supported on this system')
116
117
        os.mkfifo('a')
117
118
        # It's possible that the system supports fifos but the filesystem
118
119
        # can't.  In that case we should skip at this point.  But in fact
139
140
        abspath = './' + filename
140
141
        self._files[abspath] = (file_contents, self._clock)
141
142
 
142
 
    def _fingerprint(self, abspath, fs=None):
 
143
    def _fingerprint(self, abspath):
143
144
        entry = self._files[abspath]
144
145
        return (len(entry[0]),
145
146
                entry[1], entry[1],