[#1651] Skip tests all together on Python 2.6

ckan · Nov 17, 2015 · 9d693b6 · 9d693b6
1 parent 9ef3f9e
commit 9d693b6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/ckanext/datapusher/tests/test.py b/ckanext/datapusher/tests/test.py
@@ -47,11 +47,10 @@ def setup_class(cls):
         set_url_type(
             model.Package.get('annakarenina').resources, cls.sysadmin_user)
 
-        # Httpretty crashes with Solr on Python 2.6, disable the automatic
-        # Solr indexing
-        if (sys.version_info[0] == 2 and sys.version_info[1] == 6
-                and p.plugin_loaded('synchronous_search')):
-            p.unload('synchronous_search')
+        # Httpretty crashes with Solr on Python 2.6,
+        # skip the tests
+        if (sys.version_info[0] == 2 and sys.version_info[1] == 6):
+            raise nose.SkipTest()
 
     @classmethod
     def teardown_class(cls):

diff --git a/ckanext/resourceproxy/tests/test_proxy.py b/ckanext/resourceproxy/tests/test_proxy.py
@@ -3,6 +3,7 @@
 import unittest
 import json
 import httpretty
+import nose
 
 import paste.fixture
 from pylons import config
@@ -57,11 +58,10 @@ def setup_class(cls):
         wsgiapp = middleware.make_app(config['global_conf'], **config)
         cls.app = paste.fixture.TestApp(wsgiapp)
         create_test_data.CreateTestData.create()
-        # Httpretty crashes with Solr on Python 2.6, disable the automatic
-        # Solr indexing
-        if (sys.version_info[0] == 2 and sys.version_info[1] == 6
-                and p.plugin_loaded('synchronous_search')):
-            p.unload('synchronous_search')
+        # Httpretty crashes with Solr on Python 2.6,
+        # skip the tests
+        if (sys.version_info[0] == 2 and sys.version_info[1] == 6):
+            raise nose.SkipTest()
 
     @classmethod
     def teardown_class(cls):