Merge pull request #110 from TotallyNotRobots/gonzobot+replace-mock

Switch mock -> unittest.mock

Author: linuxdaemon

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Refactor tests to remove dependency on mock library
 
 ## [1.3.0] 2020-03-17
 ### Added

tests/core_tests/test_bot.py

@@ -1,7 +1,7 @@
 import textwrap
+from unittest.mock import patch
 
 import pytest
-from mock import patch
 
 from cloudbot import config
 

tests/core_tests/test_client.py

@@ -1,6 +1,5 @@
 import asyncio
-
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 from cloudbot.client import Client
 

tests/core_tests/test_plugin_hooks.py

@@ -8,13 +8,19 @@
 from collections import OrderedDict
 from numbers import Number
 from pathlib import Path
+from unittest.mock import patch
 
 import pytest
-from mock import patch
 
 import cloudbot.bot
 from cloudbot.event import (
-    CapEvent, CommandEvent, Event, EventType, IrcOutEvent, PostHookEvent, RegexEvent,
+    CapEvent,
+    CommandEvent,
+    Event,
+    EventType,
+    IrcOutEvent,
+    PostHookEvent,
+    RegexEvent,
 )
 from cloudbot.hook import Action
 from cloudbot.plugin import Plugin

tests/core_tests/test_plugin_manager.py

@@ -1,9 +1,9 @@
 import asyncio
 import itertools
 from pathlib import Path
+from unittest.mock import MagicMock, patch
 
 import pytest
-from mock import MagicMock, patch
 
 from cloudbot import hook
 from cloudbot.plugin import PluginManager

tests/core_tests/util_tests/test_colors.py

@@ -1,8 +1,19 @@
-import mock
+from unittest.mock import patch
+
 import pytest
 
-from cloudbot.util.colors import parse, strip, get_available_colours, get_available_formats, get_color, get_format, \
-    _convert, strip_irc, strip_all, IRC_COLOUR_DICT
+from cloudbot.util.colors import (
+    IRC_COLOUR_DICT,
+    _convert,
+    get_available_colours,
+    get_available_formats,
+    get_color,
+    get_format,
+    parse,
+    strip,
+    strip_all,
+    strip_irc,
+)
 
 test_input = "The quick $(brown, red)brown$(clear) fox$(fake) jumps over the $(bold)lazy dog$(clear)."
 
@@ -53,7 +64,7 @@ def test_get_random_color():
     assert get_color("random") in ["\x03" + i for i in IRC_COLOUR_DICT.values()]
     assert get_color("random", return_formatted=False) in list(IRC_COLOUR_DICT.values())
 
-    with mock.patch(
+    with patch(
             'cloudbot.util.colors.randint',
             return_value=4  # chosen by fair dice roll, guranteed to be random.
     ):

tests/core_tests/util_tests/test_filesize.py

@@ -1,5 +1,5 @@
 import cloudbot.util.filesize as fs
-from cloudbot.util.filesize import size, si, verbose
+from cloudbot.util.filesize import si, size, verbose
 
 
 def test_size():

tests/core_tests/util_tests/test_formatting.py

@@ -2,9 +2,24 @@
 
 import pytest
 
-from cloudbot.util.formatting import munge, dict_format, strip_colors, truncate, truncate_str, \
-    strip_html, multi_replace, multiword_replace, truncate_words, smart_split, get_text_list, ireplace, chunk_str, \
-    pluralize_suffix, pluralize_auto, gen_markdown_table
+from cloudbot.util.formatting import (
+    chunk_str,
+    dict_format,
+    gen_markdown_table,
+    get_text_list,
+    ireplace,
+    multi_replace,
+    multiword_replace,
+    munge,
+    pluralize_auto,
+    pluralize_suffix,
+    smart_split,
+    strip_colors,
+    strip_html,
+    truncate,
+    truncate_str,
+    truncate_words,
+)
 
 test_munge_input = "The quick brown fox jumps over the lazy dog"
 test_munge_count = 3

tests/core_tests/util_tests/test_http.py

@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 
 
 def test_get_soup():

tests/core_tests/util_tests/test_tokenbucket.py

@@ -1,7 +1,7 @@
 import time
+from unittest.mock import patch
 
 import pytest
-from mock import patch
 
 from cloudbot.util import tokenbucket