Merge pull request #900 from bwagnerr/fix_test_site

Fixed mockito conflict with zope

1 files changed, 3 insertions, 2 deletions

diff --git a/service/test/unit/config/test_site.py b/service/test/unit/config/test_site.py
index 6911b4a5..63ac9f1a 100644
--- a/service/test/unit/config/test_site.py
+++ b/service/test/unit/config/test_site.py
@@ -1,10 +1,11 @@
 from twisted.trial import unittest
-from mockito import mock
+from mock import MagicMock
 from pixelated.config.site import PixelatedSite
 from twisted.protocols.basic import LineReceiver
 
 
 class TestPixelatedSite(unittest.TestCase):
+
     def test_add_security_headers(self):
         request = self.create_request()
         request.process()
@@ -36,7 +37,7 @@ class TestPixelatedSite(unittest.TestCase):
 
     def create_request(self):
         channel = LineReceiver()
-        channel.site = PixelatedSite(mock())
+        channel.site = PixelatedSite(MagicMock())
         request = PixelatedSite.requestFactory(channel=channel, queued=True)
         request.method = "GET"
         request.uri = "localhost"