Merge pull request #5842 from maxalbert/allow_image_comparison_outside_tests_module

WeatherGod · WeatherGod · commit 524075927134 · 2016-01-13T13:40:42.000-05:00
Allow image comparison outside tests module
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -335,12 +335,20 @@ def _image_directories(func):
             # namespace package pip installed and run via the nose
             # multiprocess plugin or as a specific test this may be
             # missing. See https://github.com/matplotlib/matplotlib/issues/3314
-        assert mods.pop(0) == 'tests'
+        if mods.pop(0) != 'tests':
+            warnings.warn(("Module '%s' does not live in a parent module "
+                "named 'tests'. This is probably ok, but we may not be able "
+                "to guess the correct subdirectory containing the baseline "
+                "images. If things go wrong please make sure that there is "
+                "a parent directory named 'tests' and that it contains a "
+                "__init__.py file (can be empty).") % module_name)
         subdir = os.path.join(*mods)
 
         import imp
         def find_dotted_module(module_name, path=None):
-            """A version of imp which can handle dots in the module name"""
+            """A version of imp which can handle dots in the module name.
+               As for imp.find_module(), the return value is a 3-element
+               tuple (file, pathname, description)."""
             res = None
             for sub_mod in module_name.split('.'):
                 try:
