[Gzz-commits] gzz test/gzz/mediaserver/util.test gzz/mediaser...

[Tuukka Hastrup]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuukka Hastrup <address@hidden> 02/10/15 16:18:13

Modified files:
        test/gzz/mediaserver: util.test 
        gzz/mediaserver: util.py 

Log message:
        Tests pass, but sloow

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/mediaserver/util.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/mediaserver/util.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gzz/mediaserver/util.py
diff -c gzz/gzz/mediaserver/util.py:1.1 gzz/gzz/mediaserver/util.py:1.2
*** gzz/gzz/mediaserver/util.py:1.1     Tue Oct 15 03:47:53 2002
--- gzz/gzz/mediaserver/util.py Tue Oct 15 16:18:13 2002
***************
*** 15,21 ****
      tempfile."""
      inFile = open(inFilename, 'rb')
      outFile = open(outFilename, 'wb')
!     self.readHeaders(inFile)
      for a in inFile.readlines(): # 'for in inFile' (python 2.2)
          outFile.write(a)
      inFile.close()
--- 15,21 ----
      tempfile."""
      inFile = open(inFilename, 'rb')
      outFile = open(outFilename, 'wb')
!     readHeaders(inFile)
      for a in inFile.readlines(): # 'for in inFile' (python 2.2)
          outFile.write(a)
      inFile.close()
Index: gzz/test/gzz/mediaserver/util.test
diff -c gzz/test/gzz/mediaserver/util.test:1.1 
gzz/test/gzz/mediaserver/util.test:1.2
*** gzz/test/gzz/mediaserver/util.test:1.1      Tue Oct 15 03:47:53 2002
--- gzz/test/gzz/mediaserver/util.test  Tue Oct 15 16:18:13 2002
***************
*** 1,12 ****
  
  from gzz.mediaserver import util
  import md5
  
! 
testblockname='../Z/b_0000000008000000E817FEECDE00048B198A3B222DD5A647D9D98A0F9B38EFA74496C5C69E1FF4'
  
  def testReadHeaders():
! #    """Tests reading headers from a mediaserver block file"""
!     inFile = open(testblockname)
      headers = util.readHeaders(inFile)
      failUnlessEqual(len(headers), 3)
      failUnlessEqual(headers['Content-Type'], 'image/png')
--- 1,14 ----
  
  from gzz.mediaserver import util
  import md5
+ import tempfile
+ import xreadlines
  
! 
blockname='../Z/b_0000000008000000E817FEECDE00048B198A3B222DD5A647D9D98A0F9B38EFA74496C5C69E1FF4'
  
  def testReadHeaders():
!     """Tests reading headers from a mediaserver block file"""
!     inFile = open(blockname)
      headers = util.readHeaders(inFile)
      failUnlessEqual(len(headers), 3)
      failUnlessEqual(headers['Content-Type'], 'image/png')
***************
*** 14,23 ****
      failUnlessEqual(headers['Content-Transfer-Encoding'], 'binary')
  
  def testStripBlock():
! #    """Tests writing mediaserver block data into a normal file"""
      tmpname = tempfile.mktemp()
!     util.stripBlock(testblockname, tmpname)
      hash = md5.new()
!     for line in tmpname.readlines():
          hash.update(line)
      failUnlessEqual(hash.hexdigest(), "711be4dc69c602546b132c4fae3ab7f2")
--- 16,27 ----
      failUnlessEqual(headers['Content-Transfer-Encoding'], 'binary')
  
  def testStripBlock():
!     """Tests writing mediaserver block data into a normal file"""
      tmpname = tempfile.mktemp()
!     util.stripBlock(blockname, tmpname)
!     print 'Stripped'
!     tmpfile = open(tmpname, 'rb')
      hash = md5.new()
!     for line in xreadlines.xreadlines(tmpfile):
          hash.update(line)
      failUnlessEqual(hash.hexdigest(), "711be4dc69c602546b132c4fae3ab7f2")