Merge pull request #233 from nsano-rururu/mock_to_unittest_mock

change mock to build in unittest.mock

CHANGELOG.md

@@ -43,6 +43,7 @@
 - Improve Gitter alerter by explicitly specifying arg names  - [#230](https://github.com/jertel/elastalert2/pull/230) - @nsano-rururu
 - Add more alerter test code coverage - [#231](https://github.com/jertel/elastalert2/pull/231) - @nsano-rururu
 - Upgrade pytest-cov from 2.12.0 to 2.12.1 - [#232](https://github.com/jertel/elastalert2/pull/232) - @nsano-rururu
+- Migrate away from external test mock dependency - [#233](https://github.com/jertel/elastalert2/pull/233) - @nsano-rururu
 
 # 2.1.0
 

elastalert/test_rule.py

@@ -10,7 +10,7 @@
 import string
 import sys
 
-import mock
+from unittest import mock
 
 from elastalert.config import load_conf
 from elastalert.elastalert import ElastAlerter

requirements.txt

@@ -10,7 +10,6 @@ exotel>=0.1.3
 Jinja2==2.11.3
 jira>=2.0.0
 jsonschema>=3.0.2
-mock>=2.0.0
 prison>=0.1.2
 prometheus_client>=0.10.1
 py-zabbix>=1.1.3

setup.py

@@ -36,7 +36,6 @@
         'jira>=2.0.0',
         'Jinja2==2.11.3',
         'jsonschema>=3.0.2',
-        'mock>=2.0.0',
         'prison>=0.1.2',
         'prometheus_client>=0.10.1',
         'py-zabbix>=1.1.3',

tests/alerters/alerta_test.py

@@ -1,7 +1,7 @@
 import datetime
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/chatwork_test.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 from requests.auth import HTTPProxyAuth

tests/alerters/command_test.py

@@ -1,7 +1,7 @@
 import json
 import subprocess
 
-import mock
+from unittest import mock
 import pytest
 
 from elastalert.alerters.command import CommandAlerter

tests/alerters/datadog_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/dingtalk_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 from requests.auth import HTTPProxyAuth

tests/alerters/discord_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 from requests.auth import HTTPProxyAuth

tests/alerters/email_test.py

@@ -1,6 +1,6 @@
 import base64
 
-import mock
+from unittest import mock
 import pytest
 
 from elastalert.alerters.email import EmailAlerter

tests/alerters/gitter_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/googlechat_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/httppost_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/jira_test.py

@@ -1,6 +1,6 @@
 import datetime
 
-import mock
+from unittest import mock
 import pytest
 from jira import JIRAError
 

tests/alerters/line_test.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/mattermost_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/opsgenie_test.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/pagerduty_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/pagertree_test.py

@@ -2,7 +2,7 @@
 import re
 import uuid
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/rocketchat_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/servicenow_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/slack_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/teams_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/telegram_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 from requests.auth import HTTPProxyAuth

tests/alerters/thehive_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/victorops_test.py

@@ -1,6 +1,6 @@
 import json
 
-import mock
+from unittest import mock
 import pytest
 from requests import RequestException
 

tests/alerters/zabbix_test.py

@@ -1,5 +1,5 @@
 import pytest
-import mock
+from unittest import mock
 
 from elastalert.alerters.zabbix import ZabbixAlerter
 from elastalert.loaders import FileRulesLoader

tests/alerts_test.py

@@ -2,7 +2,7 @@
 import datetime
 import json
 
-import mock
+from unittest import mock
 
 from elastalert.alerts import Alerter
 from elastalert.alerts import BasicMatchString

tests/base_test.py

@@ -5,7 +5,7 @@
 import threading
 
 import elasticsearch
-import mock
+from unittest import mock
 import pytest
 from elasticsearch.exceptions import ConnectionError
 from elasticsearch.exceptions import ElasticsearchException

tests/config_test.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import os
-import mock
+from unittest import mock
 import datetime
 
 from elastalert.config import load_conf

tests/conftest.py

@@ -3,7 +3,7 @@
 import logging
 import os
 
-import mock
+from unittest import mock
 import pytest
 
 import elastalert.elastalert

tests/loaders_test.py

@@ -3,7 +3,7 @@
 import datetime
 import os
 
-import mock
+from unittest import mock
 import pytest
 
 import elastalert.alerts

tests/rules_test.py

@@ -2,7 +2,7 @@
 import copy
 import datetime
 
-import mock
+from unittest import mock
 import pytest
 
 from elastalert.ruletypes import AnyRule

tests/util_test.py

@@ -2,7 +2,7 @@
 from datetime import datetime
 from datetime import timedelta
 
-import mock
+from unittest import mock
 import pytest
 from dateutil.parser import parse as dt