Move test helpers into subdirectory

setup.cfg

@@ -4,7 +4,7 @@ nocapture=
 nologcapture=        # comment to see cherrypy logs on failure
 with-coverage=
 cover-inclusive=
-cover-package=nilmdb #.bulkdata
+cover-package=nilmdb
 cover-erase=
 ##cover-html=         # this works, puts html output in cover/ dir
 ##cover-branches=     # need nose 1.1.3 for this

tests/test_bulkdata.py

@@ -8,7 +8,7 @@ from nose.tools import *
 from nose.tools import assert_raises
 import itertools
 
-from test_helpers import *
+from testutil.helpers import *
 
 testdb = "tests/bulkdata-testdb"
 

tests/test_client.py

@@ -19,7 +19,7 @@ import unittest
 import warnings
 import resource
 
-from test_helpers import *
+from testutil.helpers import *
 
 testdb = "tests/client-testdb"
 

tests/test_cmdline.py

@@ -18,7 +18,7 @@ import Queue
 import StringIO
 import shlex
 
-from test_helpers import *
+from testutil.helpers import *
 
 testdb = "tests/cmdline-testdb"
 

tests/test_interval.py

@@ -10,13 +10,13 @@ import itertools
 
 from nilmdb.interval import Interval, DBInterval, IntervalSet, IntervalError
 
-from test_helpers import *
+from testutil.helpers import *
 import unittest
 
 # set to False to skip live renders
 do_live_renders = False
 def render(iset, description = "", live = True):
-    import renderdot
+    import testutil.renderdot as renderdot
     r = renderdot.RBTreeRenderer(iset.tree)
     return r.render(description, live and do_live_renders)
 
@@ -341,18 +341,19 @@ class TestIntervalTree:
         render(iset, "In-order insertion")
 
 class TestIntervalSpeed:
-    @unittest.skip("this is slow")
+    #@unittest.skip("this is slow")
     def test_interval_speed(self):
         import yappi
         import time
-        import aplotter
+        import testutil.aplotter as aplotter
         import random
         import math
 
         print
         yappi.start()
         speeds = {}
-        for j in [ 2**x for x in range(5,20) ]:
+        limit = 10 # was 20
+        for j in [ 2**x for x in range(5,limit) ]:
             start = time.time()
             iset = IntervalSet()
             for i in random.sample(xrange(j),j):

tests/test_iteratorizer.py

@@ -7,7 +7,7 @@ from nose.tools import assert_raises
 import threading
 import time
 
-from test_helpers import *
+from testutil.helpers import *
 
 def func_with_callback(a, b, callback):
     callback(a)

tests/test_layout.py

@@ -20,7 +20,7 @@ import cStringIO
 import random
 import unittest
 
-from test_helpers import *
+from testutil.helpers import *
 
 from nilmdb.layout import *
 

tests/test_lrucache.py

@@ -7,7 +7,7 @@ from nose.tools import assert_raises
 import threading
 import time
 
-from test_helpers import *
+from testutil.helpers import *
 
 @nilmdb.utils.lru_cache(size = 3)
 def foo1(n):

tests/test_mustclose.py

@@ -5,7 +5,7 @@ import nose
 from nose.tools import *
 from nose.tools import assert_raises
 
-from test_helpers import *
+from testutil.helpers import *
 
 import sys
 import cStringIO

tests/test_nilmdb.py

@@ -22,7 +22,7 @@ testdb = "tests/testdb"
 #def cleanup():
 #    os.unlink(testdb)
 
-from test_helpers import *
+from testutil.helpers import *
 
 class Test00Nilmdb(object):  # named 00 so it runs first
     def test_NilmDB(self):

tests/test_printf.py

@@ -6,7 +6,7 @@ from nose.tools import assert_raises
 from cStringIO import StringIO
 import sys
 
-from test_helpers import *
+from testutil.helpers import *
 
 class TestPrintf(object):
     def test_printf(self):

tests/test_rbtree.py

@@ -8,13 +8,13 @@ from nose.tools import assert_raises
 
 from nilmdb.rbtree import RBTree, RBNode
 
-from test_helpers import *
+from testutil.helpers import *
 import unittest
 
 # set to False to skip live renders
 do_live_renders = False
 def render(tree, description = "", live = True):
-    import renderdot
+    import testutil.renderdot as renderdot
     r = renderdot.RBTreeRenderer(tree)
     return r.render(description, live and do_live_renders)
 

tests/test_serializer.py

@@ -7,7 +7,7 @@ from nose.tools import assert_raises
 import threading
 import time
 
-from test_helpers import *
+from testutil.helpers import *
 
 #raise nose.exc.SkipTest("Skip these")
 

tests/test_timestamper.py

@@ -9,7 +9,7 @@ import os
 import sys
 import cStringIO
 
-from test_helpers import *
+from testutil.helpers import *
 
 class TestTimestamper(object):
 

tests/testutil/__init__.py

@@ -0,0 +1 @@
+# empty