Merge pull request #607 from etataurov/fix_tests

Fixed miscellaneous python tests errors
discoproject · Jan 6, 2015 · 28582e4 · 28582e4
2 parents 1167096 + a24aa87
commit 28582e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/test_examples.py b/tests/test_examples.py
@@ -11,8 +11,6 @@
 from chunk import LineChunker
 from grep import Grep
 from wordcount import WordCount
-from wordcount_ddb import WordCount as WordCountDDB
-from query_ddb import Query
 
 chekhov = 'http://discoproject.org/media/text/chekhov.txt'
 
@@ -31,6 +29,8 @@ def test_chunk(self):
 
     def test_discodb(self):
         if self.settings['DISCO_TEST_DISCODB']:
+            from wordcount_ddb import WordCount as WordCountDDB
+            from query_ddb import Query
             a, b = WordCountDDB(), Query()
             b.params = 'discover'
             self.job = JobChain({a: [chekhov], b: a})

diff --git a/tests/test_external.py b/tests/test_external.py
@@ -16,7 +16,6 @@ def serve(self, path):
         return 'test_{0}\n'.format(path)
 
     def setUp(self):
-        super(ExternalTestCase, self).setUp()
         if uname()[0] == 'Darwin':
             self.skipTest('Cannot build static test_external on OS X')
         else:
@@ -29,6 +28,7 @@ def setUp(self):
                         path.join(home, 'tests', 'test_external.c'),
                         '-l', 'Judy'],
                        stderr=STDOUT)
+        super(ExternalTestCase, self).setUp()
 
     def test_extmap(self):
         def reduce(iter, params):