Fix: disabled tests for files module were still causing problems

Author: hannes-ucsc

src/bd2k/util/test/test_files.py

@@ -2,11 +2,10 @@
 
 from mock import MagicMock, call
 
-from bd2k.util.files import gread, gwrite
-
 
 class TestFiles( TestCase ):
     if False:
+        from bd2k.util.files import gread, gwrite
         # See comment in module under test
         def test_gread( self ):
             for n in range( 0, 4 ):
@@ -16,7 +15,7 @@ def test_gread( self ):
                 f.read.side_effect = [ '1', '2', '' ]
                 # Read n bytes greedily
                 # noinspection PyTypeChecker
-                self.assertEqual( gread( f, n ), "12"[ :n ] )
+                self.assertEqual( self.gread( f, n ), "12"[ :n ] )
                 # First call to read() should request n bytes and then one less on each subsequent call.
                 self.assertEqual( f.mock_calls, [ call.read( i ) for i in range( n, 0, -1 ) ] )
 
@@ -27,7 +26,7 @@ def test_gwrite( self ):
                 f.write.side_effect = [ 1 ] * n
                 s = "12"[ :n ]
                 # noinspection PyTypeChecker
-                gwrite( f, s )
+                self.gwrite( f, s )
                 # The first call to write() should be passed the entire string, minus one byte off
                 # the front for each subsequent call.
                 self.assertEqual( f.mock_calls, [ call.write( s[ i: ] ) for i in range( 0, n ) ] )