cleanup tests

enthought · Dec 12, 2014 · 229415e · 229415e
1 parent 66f1e7a
commit 229415e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/kiva/tests/test_agg_drawing.py b/kiva/tests/test_agg_drawing.py
@@ -5,9 +5,6 @@
 
 class TestAggDrawing(DrawingImageTester, unittest.TestCase):
 
-    def setUp(self):
-        DrawingImageTester.setUp(self)
-
     def create_graphics_context(self, width, height):
         return GraphicsContext((width, height))
 

diff --git a/kiva/tests/test_gl_drawing.py b/kiva/tests/test_gl_drawing.py
@@ -8,8 +8,6 @@
     PYGLET_NOT_AVAILABLE = False
 
 
-from pyglet.image.codecs.png import PNGImageEncoder
-
 from kiva.tests.drawing_tester import DrawingImageTester
 from traits.testing.unittest_tools import unittest
 
@@ -42,6 +40,8 @@ def test_text_clip(self):
 
     @contextlib.contextmanager
     def draw_and_check(self):
+        from pyglet.image.codecs.png import PNGImageEncoder
+
         self.window.clear()
         self.window.switch_to()
         self.window.dispatch_events()

diff --git a/kiva/tests/test_pdf_drawing.py b/kiva/tests/test_pdf_drawing.py
@@ -19,9 +19,9 @@
 
 
 @unittest.skipIf(PYPDF2_NOT_AVAILABLE, "PDF tests require PyPDF2")
+@unittest.skipIf(REPORTLAB_NOT_AVAILABLE, "Cannot import reportlab")
 class TestPDFDrawing(DrawingTester, unittest.TestCase):
 
-    @unittest.skipIf(REPORTLAB_NOT_AVAILABLE, "Cannot import reportlab")
     def create_graphics_context(self, width, height):
         from reportlab.pdfgen.canvas import Canvas
         from kiva.pdf import GraphicsContext