From 955ac9c44c36cfe5163f9f9b78578190843a0666 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 9 Aug 2015 14:26:54 +0200
Subject: [PATCH] get rid of testsuite.mock, directly import from mock

this was left over from times when we either used mock from stdlib
or pypi mock. but as we only use pypi mock now, the indirection is
not needed any more.
---
 borg/testsuite/archive.py    |  2 +-
 borg/testsuite/archiver.py   |  3 ++-
 borg/testsuite/mock.py       | 14 --------------
 borg/testsuite/repository.py |  3 ++-
 4 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 borg/testsuite/mock.py

diff --git a/borg/testsuite/archive.py b/borg/testsuite/archive.py
index 9a20e9f6e..a963573ec 100644
--- a/borg/testsuite/archive.py
+++ b/borg/testsuite/archive.py
@@ -1,12 +1,12 @@
 from datetime import datetime, timezone
 
 import msgpack
+from mock import Mock
 
 from ..archive import Archive, CacheChunkBuffer, RobustUnpacker
 from ..key import PlaintextKey
 from ..helpers import Manifest
 from . import BaseTestCase
-from .mock import Mock
 
 
 class MockCache:
diff --git a/borg/testsuite/archiver.py b/borg/testsuite/archiver.py
index 7a2b75780..20e76a7e0 100644
--- a/borg/testsuite/archiver.py
+++ b/borg/testsuite/archiver.py
@@ -11,6 +11,8 @@ import time
 import unittest
 from hashlib import sha256
 
+from mock import patch
+
 from .. import xattr
 from ..archive import Archive, ChunkBuffer, CHUNK_MAX_EXP
 from ..archiver import Archiver
@@ -20,7 +22,6 @@ from ..helpers import Manifest
 from ..remote import RemoteRepository, PathNotAllowed
 from ..repository import Repository
 from . import BaseTestCase
-from .mock import patch
 
 try:
     import llfuse
diff --git a/borg/testsuite/mock.py b/borg/testsuite/mock.py
deleted file mode 100644
index bdd030b10..000000000
--- a/borg/testsuite/mock.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""
-Mocking
-
-Note: unittest.mock is broken on at least python 3.3.6 and 3.4.0.
-      it silently ignores mistyped method names starting with assert_...,
-      does nothing and just succeeds.
-      The issue was fixed in the separately distributed "mock" lib, you
-      get an AttributeError there. So, always use that one!
-
-Details:
-
-http://engineeringblog.yelp.com/2015/02/assert_called_once-threat-or-menace.html
-"""
-from mock import *
diff --git a/borg/testsuite/repository.py b/borg/testsuite/repository.py
index 1c9fd072d..74996b717 100644
--- a/borg/testsuite/repository.py
+++ b/borg/testsuite/repository.py
@@ -2,13 +2,14 @@ import os
 import shutil
 import tempfile
 
+from mock import patch
+
 from ..hashindex import NSIndex
 from ..helpers import Location, IntegrityError
 from ..locking import UpgradableLock
 from ..remote import RemoteRepository, InvalidRPCMethod
 from ..repository import Repository
 from . import BaseTestCase
-from .mock import patch
 
 
 class RepositoryTestCaseBase(BaseTestCase):