Fix running of tests without installation.

QuLogic · QuLogic · commit a4427a1cf031 · 2017-02-16T02:43:11.000-05:00
* Check for installed test data only if testing installed package.
* Remove relative import out of tests.
* Replace assert_str_equal with plain assert (pytest does diffing
  already).
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1488,9 +1488,6 @@ def _init_tests():
     else:
         faulthandler.enable()
 
-    if not os.path.isdir(os.path.join(os.path.dirname(__file__), 'tests')):
-        raise ImportError("matplotlib test data is not installed")
-
     # The version of FreeType to install locally for running the
     # tests.  This must match the value in `setupext.py`
     LOCAL_FREETYPE_VERSION = '2.6.1'
@@ -1526,6 +1523,8 @@ def test(verbosity=None, coverage=False, switch_backend_warn=True,
          recursionlimit=0, **kwargs):
     """run the matplotlib test suite"""
     _init_tests()
+    if not os.path.isdir(os.path.join(os.path.dirname(__file__), 'tests')):
+        raise ImportError("matplotlib test data is not installed")
 
     old_backend = get_backend()
     old_recursionlimit = sys.getrecursionlimit()
diff --git a/lib/matplotlib/tests/test_preprocess_data.py b/lib/matplotlib/tests/test_preprocess_data.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from .. import _preprocess_data
+from matplotlib import _preprocess_data
 
 
 # Notes on testing the plotting functions itself
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -17,7 +17,6 @@
     import mock
 import matplotlib as mpl
 import matplotlib.pyplot as plt
-from matplotlib.tests import assert_str_equal
 import matplotlib.colors as mcolors
 from itertools import chain
 import numpy as np
@@ -93,7 +92,7 @@ def test_RcParams_class():
           u'font.size': 12.0,
           u'font.weight': u'normal'})""".lstrip()
 
-    assert_str_equal(expected_repr, repr(rc))
+    assert expected_repr == repr(rc)
 
     if six.PY3:
         expected_str = """
@@ -108,7 +107,7 @@ def test_RcParams_class():
 font.size: 12.0
 font.weight: normal""".lstrip()
 
-    assert_str_equal(expected_str, str(rc))
+    assert expected_str == str(rc)
 
     # test the find_all functionality
     assert ['font.cursive', 'font.size'] == sorted(rc.find_all('i[vz]'))
