Revision: 7883
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7883&view=rev
Author: mdboom
Date: 2009-10-14 17:37:41 +0000 (Wed, 14 Oct 2009)
Log Message:
-----------
Support running of individual tests and multiprocess support.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/__init__.py
trunk/matplotlib/lib/matplotlib/testing/compare.py
trunk/matplotlib/lib/matplotlib/tests/__init__.py
Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py 2009-10-13 05:28:55 UTC (rev
7882)
+++ trunk/matplotlib/lib/matplotlib/__init__.py 2009-10-14 17:37:41 UTC (rev
7883)
@@ -920,19 +920,6 @@
from testing.noseclasses import KnownFailure
from nose.plugins.manager import PluginManager
- # Store the current backend and all rcParams for restoration later
- backend = rcParams['backend']
- original_params = rcParams.copy()
-
- use('Agg', warn=False) # use Agg backend for these tests
-
- # These settings *must* be hardcoded for running the comparison
- # tests and are not necessarily the default values as specified in
- # rcsetup.py
- rcdefaults() # Start with all defaults
- rcParams['font.family'] = 'Bitstream Vera Sans'
- rcParams['text.hinting'] = False
-
# store the old values before overriding
plugins = []
plugins.append( KnownFailure() )
@@ -945,9 +932,6 @@
config=config,
)
- # restore the old backend and rcParams
- use(backend, warn=False)
- rcParams.update(original_params)
return success
test.__test__ = False # nose: this function is not a test
Modified: trunk/matplotlib/lib/matplotlib/testing/compare.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/testing/compare.py 2009-10-13 05:28:55 UTC
(rev 7882)
+++ trunk/matplotlib/lib/matplotlib/testing/compare.py 2009-10-14 17:37:41 UTC
(rev 7883)
@@ -152,7 +152,8 @@
msg += "Standard error:\n%s\n" % stderr
raise IOError, msg
-if matplotlib.checkdep_xmllint():
+# Turning this off, because it seems to cause multiprocessing issues
+if matplotlib.checkdep_xmllint() and False:
verifiers['svg'] = lambda filename: [
'xmllint', '--valid', '--nowarning', '--noout', filename]
Modified: trunk/matplotlib/lib/matplotlib/tests/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/__init__.py 2009-10-13 05:28:55 UTC
(rev 7882)
+++ trunk/matplotlib/lib/matplotlib/tests/__init__.py 2009-10-14 17:37:41 UTC
(rev 7883)
@@ -0,0 +1,13 @@
+from matplotlib import rcParams, rcdefaults, use
+
+_multiprocess_can_split_ = True
+
+def setup():
+ use('Agg', warn=False) # use Agg backend for these tests
+
+ # These settings *must* be hardcoded for running the comparison
+ # tests and are not necessarily the default values as specified in
+ # rcsetup.py
+ rcdefaults() # Start with all defaults
+ rcParams['font.family'] = 'Bitstream Vera Sans'
+ rcParams['text.hinting'] = False
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
