Use the mock that finds a working implementation

Instead of using the library provided mock, use the import
logic in our tests module that tries to find the best one that is
usable in the current environment. It appears that this logic
is *still* needed due to bugs in the non-bundled mock that
causes errors/exceptions such as:

AttributeError: 'method-wrapper' object has no attribute '__module__'

It seems this is related to (or is this same) upstream bug:

- https://code.google.com/p/mock/issues/detail?id=234

Change-Id: Ifeb3017f43b7d34af155ceca35d040706d34b185

1 files changed, 7 insertions, 0 deletions

diff --git a/taskflow/test.py b/taskflow/test.py
index 32c0b0f..c6a56a9 100644
--- a/taskflow/test.py
+++ b/taskflow/test.py
@@ -21,13 +21,20 @@ import fixtures
 from oslotest import base
 from oslotest import mockpatch
 import six
+
+# This is weird like this since we want to import a mock that works the best
+# and we need to try this import order, since oslotest registers a six.moves
+# module (but depending on the import order of importing oslotest we may or
+# may not see that change when trying to use it from six).
 try:
     from six.moves import mock
 except ImportError:
     try:
+        # In python 3.3+ mock got included in the standard library...
         from unittest import mock
     except ImportError:
         import mock
+
 from testtools import compat
 from testtools import matchers
 from testtools import testcase