From ec66cae7843a459e093cd60a5aa23e6888b98a9f Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 1 Dec 2012 10:48:54 +0100 Subject: [PATCH] tests: Ignore http tests if cherrypy is missing --- tests/frontends/http/events_test.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/frontends/http/events_test.py b/tests/frontends/http/events_test.py index d04eb93e..631802c4 100644 --- a/tests/frontends/http/events_test.py +++ b/tests/frontends/http/events_test.py @@ -1,14 +1,22 @@ import json -import cherrypy +try: + import cherrypy +except ImportError: + cherrypy = False import mock -from mopidy.frontends.http import HttpFrontend +from mopidy.exceptions import OptionalDependencyError +try: + from mopidy.frontends.http import HttpFrontend +except OptionalDependencyError: + pass from tests import unittest -@mock.patch.object(cherrypy.engine, 'publish') +@unittest.skipUnless(cherrypy, 'cherrypy not found') +@mock.patch('cherrypy.engine.publish') class HttpEventsTest(unittest.TestCase): def setUp(self): self.http = HttpFrontend(core=mock.Mock())