Merge branch 'py2n3'0.6.0

* python 3 compatibility
* all tests work in py2.6, 2.7, 3.3, 3.4

1 files changed, 15 insertions, 13 deletions

diff --git a/gitdb/test/performance/test_pack.py b/gitdb/test/performance/test_pack.py
index 63856e2..db3b48d 100644
--- a/gitdb/test/performance/test_pack.py
+++ b/gitdb/test/performance/test_pack.py
@@ -3,22 +3,24 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Performance tests for object store"""
-from lib import (
+from __future__ import print_function
+
+from gitdb.test.performance.lib import (
     TestBigRepoR 
-    )
+)
 
 from gitdb.exc import UnsupportedOperation
 from gitdb.db.pack import PackedDB
+from gitdb.utils.compat import xrange
+from gitdb.test.lib import skip_on_travis_ci
 
 import sys
 import os
 from time import time
-import random
-
-from nose import SkipTest
 
 class TestPackedDBPerformance(TestBigRepoR):
-    
+
+    @skip_on_travis_ci    
     def test_pack_random_access(self):
         pdb = PackedDB(os.path.join(self.gitrepopath, "objects/pack"))
         
@@ -27,7 +29,7 @@ class TestPackedDBPerformance(TestBigRepoR):
         sha_list = list(pdb.sha_iter())
         elapsed = time() - st
         ns = len(sha_list)
-        print >> sys.stderr, "PDB: looked up %i shas by index in %f s ( %f shas/s )" % (ns, elapsed, ns / elapsed)
+        print("PDB: looked up %i shas by index in %f s ( %f shas/s )" % (ns, elapsed, ns / elapsed), file=sys.stderr)
         
         # sha lookup: best-case and worst case access
         pdb_pack_info = pdb._pack_info
@@ -41,7 +43,7 @@ class TestPackedDBPerformance(TestBigRepoR):
         # discard cache
         del(pdb._entities)
         pdb.entities()
-        print >> sys.stderr, "PDB: looked up %i sha in %i packs in %f s ( %f shas/s )" % (ns, len(pdb.entities()), elapsed, ns / elapsed)
+        print("PDB: looked up %i sha in %i packs in %f s ( %f shas/s )" % (ns, len(pdb.entities()), elapsed, ns / elapsed), file=sys.stderr)
         # END for each random mode
         
         # query info and streams only
@@ -51,7 +53,7 @@ class TestPackedDBPerformance(TestBigRepoR):
             for sha in sha_list[:max_items]:
                 pdb_fun(sha)
             elapsed = time() - st
-            print >> sys.stderr, "PDB: Obtained %i object %s by sha in %f s ( %f items/s )" % (max_items, pdb_fun.__name__.upper(), elapsed, max_items / elapsed)
+            print("PDB: Obtained %i object %s by sha in %f s ( %f items/s )" % (max_items, pdb_fun.__name__.upper(), elapsed, max_items / elapsed), file=sys.stderr)
         # END for each function
         
         # retrieve stream and read all
@@ -65,13 +67,13 @@ class TestPackedDBPerformance(TestBigRepoR):
             total_size += stream.size
         elapsed = time() - st
         total_kib = total_size / 1000
-        print >> sys.stderr, "PDB: Obtained %i streams by sha and read all bytes totallying %i KiB ( %f KiB / s ) in %f s ( %f streams/s )" % (max_items, total_kib, total_kib/elapsed , elapsed, max_items / elapsed)
+        print("PDB: Obtained %i streams by sha and read all bytes totallying %i KiB ( %f KiB / s ) in %f s ( %f streams/s )" % (max_items, total_kib, total_kib/elapsed , elapsed, max_items / elapsed), file=sys.stderr)
         
+    @skip_on_travis_ci
     def test_correctness(self):
-        raise SkipTest("Takes too long, enable it if you change the algorithm and want to be sure you decode packs correctly")
         pdb = PackedDB(os.path.join(self.gitrepopath, "objects/pack"))
         # disabled for now as it used to work perfectly, checking big repositories takes a long time
-        print >> sys.stderr, "Endurance run: verify streaming of objects (crc and sha)"
+        print("Endurance run: verify streaming of objects (crc and sha)", file=sys.stderr)
         for crc in range(2):
             count = 0
             st = time()
@@ -88,6 +90,6 @@ class TestPackedDBPerformance(TestBigRepoR):
                 # END for each index
             # END for each entity
             elapsed = time() - st
-            print >> sys.stderr, "PDB: verified %i objects (crc=%i) in %f s ( %f objects/s )" % (count, crc, elapsed, count / elapsed)
+            print("PDB: verified %i objects (crc=%i) in %f s ( %f objects/s )" % (count, crc, elapsed, count / elapsed), file=sys.stderr)
         # END for each verify mode