Don't change existing test set.

mdboom · mdboom · commit 7c132788738a · 2014-07-12T11:45:31.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ env:
     - secure: RgJI7BBL8aX5FTOQe7xiXqWHMxWokd6GNUWp1NUV2mRLXPb9dI0RXqZt3UJwKTAzf1z/OtlHDmEkBoTVK81E9iUxK5npwyyjhJ8yTJmwfQtQF2n51Q1Ww9p+XSLORrOzZc7kAo6Kw6FIXN1pfctgYq2bQkrwJPRx/oPR8f6hcbY=
     - secure: E7OCdqhZ+PlwJcn+Hd6ns9TDJgEUXiUNEI0wu7xjxB2vBRRIKtZMbuaZjd+iKDqCKuVOJKu0ClBUYxmgmpLicTwi34CfTUYt6D4uhrU+8hBBOn1iiK51cl/aBvlUUrqaRLVhukNEBGZcyqAjXSA/Qsnp2iELEmAfOUa92ZYo1sk=
 
-    - TEST_COMMAND="python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300"
+    - TEST_ARGS=--no-pep8
 
 before_script:
   - gem install travis-artifacts
@@ -20,16 +20,8 @@ python:
 
 matrix:
   include:
-    - python: 2.6
-
-    - python: 2.7
-
-    - python: 3.3
-
-    - python: 3.4
-
     - python: 2.7
-      env: TEST_COMMAND="nosetests matplotlib.tests.test_coding_standards"
+      env: TEST_ARGS=--pep8
 
 install:
   - pip install -q --use-mirrors nose python-dateutil numpy pep8 pyparsing pillow
@@ -46,7 +38,7 @@ script:
   # Generate the font caches in a single process before starting the
   # multiple processes
   - python -c "from matplotlib import font_manager"
-  - $(TEST_COMMAND)
+  - python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300 $(TEST_ARGS)
 
 after_failure:
   - tar cjf result_images.tar.bz2 result_images
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1325,11 +1325,12 @@ def tk_window_focus():
     'matplotlib.tests.test_basic',
     'matplotlib.tests.test_bbox_tight',
     'matplotlib.tests.test_cbook',
+    'matplotlib.tests.test_coding_standards',
     'matplotlib.tests.test_collections',
     'matplotlib.tests.test_colorbar',
     'matplotlib.tests.test_colors',
     'matplotlib.tests.test_compare_images',
-    'matplotlib.tests.test_contour',
+    'matplotlib.tests.test_contour',t
     'matplotlib.tests.test_dates',
     'matplotlib.tests.test_delaunay',
     'matplotlib.tests.test_figure',
@@ -1386,9 +1387,10 @@ def test(verbosity=1):
         # a list.
         multiprocess._instantiate_plugins = [KnownFailure]
 
-        success = nose.run( defaultTest=default_test_modules,
-                            config=config,
-                            )
+        success = nose.run(
+            defaultTest=default_test_modules,
+            config=config,
+        )
     finally:
         if old_backend.lower() != 'agg':
             use(old_backend)
diff --git a/tests.py b/tests.py
@@ -10,6 +10,7 @@
 # these options.
 
 import os
+import sys
 import time
 
 import matplotlib
@@ -39,4 +40,9 @@ def run():
               defaultTest=default_test_modules)
 
 if __name__ == '__main__':
+    if '--no-pep8' in sys.argv:
+        default_test_modules.remove('matplotlib.tests.test_coding_standards')
+    elif '--pep8' in sys.argv:
+        default_test_modules = ['matplotlib.tests.test_coding_standards']
+
     run()
