- replace most explicitly-named test objects called "Mock..." with

actual mock objects from the mock library.  I'd like to use mock
for new tests so we might as well use it in obvious places.
- use unittest.mock in py3.3
- changelog
- add a note to README.unittests
- add tests_require in setup.py
- have tests import from sqlalchemy.testing.mock
- apply usage of mock to one of the event tests.  we can be using
this approach all over the place.

2 files changed, 17 insertions, 0 deletions

diff --git a/lib/sqlalchemy/testing/__init__.py b/lib/sqlalchemy/testing/__init__.py
index d5522213d..a87829499 100644
--- a/lib/sqlalchemy/testing/__init__.py
+++ b/lib/sqlalchemy/testing/__init__.py
@@ -18,3 +18,5 @@ from .util import run_as_contextmanager, rowset, fail, provide_metadata, adict
 crashes = skip
 
 from .config import db, requirements as requires
+
+from . import mock
\ No newline at end of file
diff --git a/lib/sqlalchemy/testing/mock.py b/lib/sqlalchemy/testing/mock.py
new file mode 100644
index 000000000..650962384
--- /dev/null
+++ b/lib/sqlalchemy/testing/mock.py
@@ -0,0 +1,15 @@
+"""Import stub for mock library.
+"""
+from __future__ import absolute_import
+from ..util import py33
+
+if py33:
+    from unittest.mock import MagicMock, Mock, call
+else:
+    try:
+        from mock import MagicMock, Mock, call
+    except ImportError:
+        raise ImportError(
+                "SQLAlchemy's test suite requires the "
+                "'mock' library as of 0.8.2.")
+