From 7e854af69b807318015031c22b173fa358abaf22 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Sat, 11 Apr 2009 04:56:39 +0000 Subject: [PATCH] skip serialization tests if simplejson module is not available --HG-- extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%401048 --- scrapy/trunk/scrapy/tests/test_serialization.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scrapy/trunk/scrapy/tests/test_serialization.py b/scrapy/trunk/scrapy/tests/test_serialization.py index 1c7d3f18c..712c4af24 100644 --- a/scrapy/trunk/scrapy/tests/test_serialization.py +++ b/scrapy/trunk/scrapy/tests/test_serialization.py @@ -1,9 +1,16 @@ -import unittest -from scrapy.utils.serialization import serialize, unserialize, serialize_funcs +from twisted.trial import unittest class SerializationTest(unittest.TestCase): + + def setUp(self): + try: + import simplejson + except ImportError, e: + raise unittest.SkipTest(e) + def test_string_serialization(self): """Test simple string serialization""" + from scrapy.utils.serialization import serialize, unserialize, serialize_funcs s = "string to serialize" for format in serialize_funcs.iterkeys(): @@ -11,6 +18,7 @@ class SerializationTest(unittest.TestCase): def test_dict_serialization(self): """Test dict serialization""" + from scrapy.utils.serialization import serialize, unserialize, serialize_funcs # using only string keys/values since it's the only data type that # works with all serializers