From ddcc8623d7d85699dc0e3a73080620f83079a6a8 Mon Sep 17 00:00:00 2001 From: Luke Lee Date: Thu, 4 Aug 2016 11:18:30 +0200 Subject: [PATCH] Skip django/flask tests if not installed - Django and Flask are not firm requirements set out in the setup.py so makes sense to not mark the tests as failed if they aren't installed. --- jsonrpc/tests/test_backend_django/tests.py | 9 +++++++-- jsonrpc/tests/test_backend_flask/tests.py | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/jsonrpc/tests/test_backend_django/tests.py b/jsonrpc/tests/test_backend_django/tests.py index 3f8ff0e..664bfaa 100644 --- a/jsonrpc/tests/test_backend_django/tests.py +++ b/jsonrpc/tests/test_backend_django/tests.py @@ -2,8 +2,13 @@ from __future__ import absolute_import import os -from django.core.urlresolvers import RegexURLPattern -from django.test import TestCase +try: + from django.core.urlresolvers import RegexURLPattern + from django.test import TestCase +except ImportError: + import unittest + raise unittest.SkipTest('Django not found for testing') + from ...backend.django import JSONRPCAPI, api import json diff --git a/jsonrpc/tests/test_backend_flask/tests.py b/jsonrpc/tests/test_backend_flask/tests.py index f57a7a1..5dd48ad 100644 --- a/jsonrpc/tests/test_backend_flask/tests.py +++ b/jsonrpc/tests/test_backend_flask/tests.py @@ -7,9 +7,13 @@ else: import unittest -# Flask is supported only for python2 and pyton3.3+ +# Flask is supported only for python2 and python3.3+ if sys.version_info < (3, 0) or sys.version_info >= (3, 3): - from flask import Flask + try: + from flask import Flask + except ImportError: + raise unittest.SkipTest('Flask not found for testing') + from ...backend.flask import JSONRPCAPI, api @api.dispatcher.add_method