From 05ae85da698e78581e03335db7065a319da3ff1b Mon Sep 17 00:00:00 2001
From: Alexandre Detiste <alexandre.detiste@gmail.com>
Date: Sun, 28 Apr 2024 01:31:49 +0200
Subject: [PATCH] prefer newer unittest.mock when available

---
 tests/test_datacontainer.py     | 5 ++++-
 tests/test_memory_leak.py       | 5 ++++-
 tests/test_sampleprobe.py       | 5 ++++-
 tests/test_senderprotocol.py    | 5 ++++-
 tests/test_zabbixagentconfig.py | 5 ++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/tests/test_datacontainer.py b/tests/test_datacontainer.py
index c3a0962..4f46dc9 100644
--- a/tests/test_datacontainer.py
+++ b/tests/test_datacontainer.py
@@ -3,12 +3,15 @@
 """
 import configobj
 import pytest
-import mock
 import unittest
 import time
 try: import simplejson as json
 except ImportError: import json
 import socket
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import sys
 import os
diff --git a/tests/test_memory_leak.py b/tests/test_memory_leak.py
index 12408bb..1b591e5 100644
--- a/tests/test_memory_leak.py
+++ b/tests/test_memory_leak.py
@@ -3,8 +3,11 @@
 """
 import configobj
 import pytest
-import mock
 import unittest
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import resource
 import sys
diff --git a/tests/test_sampleprobe.py b/tests/test_sampleprobe.py
index 8cf696a..0e9b138 100644
--- a/tests/test_sampleprobe.py
+++ b/tests/test_sampleprobe.py
@@ -3,9 +3,12 @@
 """
 import configobj
 import pytest
-import mock
 import unittest
 import socket
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import resource
 import time
diff --git a/tests/test_senderprotocol.py b/tests/test_senderprotocol.py
index 11987b4..1b0e877 100644
--- a/tests/test_senderprotocol.py
+++ b/tests/test_senderprotocol.py
@@ -3,12 +3,15 @@
 """
 import configobj
 import pytest
-import mock
 import unittest
 import time
 try: import simplejson as json
 except ImportError: import json
 import socket
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import sys
 import os
diff --git a/tests/test_zabbixagentconfig.py b/tests/test_zabbixagentconfig.py
index de3f9dc..b5844a0 100644
--- a/tests/test_zabbixagentconfig.py
+++ b/tests/test_zabbixagentconfig.py
@@ -3,9 +3,12 @@
 """
 import configobj
 import pytest
-import mock
 import unittest
 import logging
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import sys
 import os