summaryrefslogtreecommitdiff
path: root/gitdb/test/test_stream.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-11-14 12:39:09 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-11-14 12:40:22 +0100
commit0dcec5a27b341ce58e5ab169f91aa25b2cafec0c (patch)
tree176a493d114fab7cc6e930bf318b2339db386cf5 /gitdb/test/test_stream.py
parente7fdd949d0cb2c42c9217e3c7009eb28c6b53446 (diff)
downloadgitdb-py2n3.tar.gz
It seems zlib works differently in py26, and thus requires special handling.py2n3
This also explains why the tests suddenly stopped working - after all, the interpreter changed ... .
Diffstat (limited to 'gitdb/test/test_stream.py')
-rw-r--r--gitdb/test/test_stream.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/gitdb/test/test_stream.py b/gitdb/test/test_stream.py
index f8d9f5d..50db44b 100644
--- a/gitdb/test/test_stream.py
+++ b/gitdb/test/test_stream.py
@@ -27,8 +27,6 @@ from gitdb.typ import (
import tempfile
import os
-import sys
-from nose import SkipTest
class TestStream(TestBase):
"""Test stream classes"""
@@ -71,16 +69,10 @@ class TestStream(TestBase):
# END handle special type
def test_decompress_reader(self):
- cache = dict()
for close_on_deletion in range(2):
for with_size in range(2):
for ds in self.data_sizes:
- if ds in cache:
- cdata = cache[ds]
- else:
- cdata = make_bytes(ds, randomize=False)
- cache[ds] = cdata
- # end handle caching (maybe helps on py2.6 ?)
+ cdata = make_bytes(ds, randomize=False)
# zdata = zipped actual data
# cdata = original content data
@@ -128,9 +120,6 @@ class TestStream(TestBase):
assert writer.sha() != prev_sha
def test_compressed_writer(self):
- if sys.version_info[:2] < (2,7) and os.environ.get('TRAVIS'):
- raise SkipTest("For some reason, this test STALLS on travis ci on py2.6, but works on my centos py2.6 interpreter")
- # end special case ...
for ds in self.data_sizes:
fd, path = tempfile.mkstemp()
ostream = FDCompressedSha1Writer(fd)