Blob Blame History Raw
From bbd70d33e334e313565c45fc115b192bc9456b02 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <kdreyer@redhat.com>
Date: Fri, 3 Sep 2021 13:22:06 -0400
Subject: [PATCH] use unittest.mock on py3

unittest.mock is in stdlib on Python 3.3+. Use the non-stdlib mock
package on older Python versions.
---
 remoto/tests/test_log.py     | 5 ++++-
 remoto/tests/test_process.py | 5 ++++-
 remoto/tests/test_rsync.py   | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/remoto/tests/test_log.py b/remoto/tests/test_log.py
index f6fcf78..d685230 100644
--- a/remoto/tests/test_log.py
+++ b/remoto/tests/test_log.py
@@ -1,7 +1,10 @@
 from pytest import raises
 from remoto import log
 from remoto.exc import TimeoutError
-from mock import Mock
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 
 
 class TestReporting(object):
diff --git a/remoto/tests/test_process.py b/remoto/tests/test_process.py
index 5509705..541f717 100644
--- a/remoto/tests/test_process.py
+++ b/remoto/tests/test_process.py
@@ -1,4 +1,7 @@
-from mock import Mock
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 from remoto import process
 
 
diff --git a/remoto/tests/test_rsync.py b/remoto/tests/test_rsync.py
index dc5b71d..220cdd1 100644
--- a/remoto/tests/test_rsync.py
+++ b/remoto/tests/test_rsync.py
@@ -1,4 +1,7 @@
-from mock import Mock, patch
+try:
+    from unittest.mock import Mock, patch
+except ImportError:
+    from mock import Mock, patch
 from remoto import file_sync