Merge branch 'v1.0.x'

Author: ddale

lib/matplotlib/testing/noseclasses.py

@@ -9,7 +9,7 @@ class KnownFailureDidNotFailTest(Exception):
     '''Raise this exception to mark a test should have failed but did not.'''
     pass
 
-class ImageComparisonFailure(Exception):
+class ImageComparisonFailure(AssertionError):
     '''Raise this exception to mark a test as a comparison between two images.'''
 
 class KnownFailure(ErrorClassPlugin):