Merge pull request #137 from moggers87/fix-test-deps

Fix test deps

setup.py

@@ -11,8 +11,7 @@
 ]
 
 tests_require = [
-    'jinja2',
-    'mock',
+    'jinja2<3.0',
 ]
 
 extras_require = {

tests/command_tests.py

@@ -1,10 +1,10 @@
 from tempfile import mkdtemp
+from unittest.mock import Mock, patch
 import mailbox
 import os
 import sys
 
 from click import testing
-from mock import Mock, patch
 
 from salmon import queue, commands, encoding, mail, routing, utils
 

tests/confirm_tests.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from salmon import mail, view
 from salmon.confirm import ConfirmationEngine, ConfirmationStorage

tests/encoding_tests.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from email import encoders
 from email.utils import parseaddr
+from unittest.mock import Mock, patch
 import mailbox
 import os
 
-from mock import Mock, patch
 import chardet
 
 from salmon import encoding

tests/handler_tests.py

@@ -1,7 +1,6 @@
+from unittest.mock import Mock
 import sys
 
-from mock import Mock
-
 from salmon import mail, utils
 from salmon.routing import Router
 

tests/queue_tests.py

@@ -1,9 +1,8 @@
+from unittest.mock import Mock, patch
 import mailbox
 import os
 import shutil
 
-from mock import Mock, patch
-
 from salmon import mail, queue
 
 from .setup_env import SalmonTestCase

tests/routing_tests.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from salmon import routing
 from salmon.mail import MailRequest

tests/server_tests.py

@@ -1,8 +1,8 @@
 # Copyright (C) 2008 Zed A. Shaw.  Licensed under the terms of the GPLv3.
+from unittest.mock import Mock, call, patch
 import socket
 import sys
 
-from mock import Mock, call, patch
 import lmtpd
 
 from salmon import mail, queue, routing, server

tests/testing_tests.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from salmon.testing import RouterConversation, assert_in_state, clear_queue, delivered, queue, relay
 

tests/utils_tests.py

@@ -1,9 +1,8 @@
 from tempfile import mkdtemp
 from unittest import TestCase
+from unittest.mock import patch
 import os
 
-from mock import patch
-
 from salmon import utils
 
 from .setup_env import SalmonTestCase