diff options
| author | Robert Collins <rbtcollins@hp.com> | 2015-08-25 10:26:14 +1200 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2015-08-25 10:28:27 +1200 |
| commit | d7f80b24f37ffb5e5cd1f7b2ccfa83c144a79c4d (patch) | |
| tree | e543f55e2b3a01c659c5efc58226c57a0188d146 /ironic/tests/__init__.py | |
| parent | d9fccbd5ab1445a5ab2b3eae8714d5c1c6db280f (diff) | |
| download | ironic-d7f80b24f37ffb5e5cd1f7b2ccfa83c144a79c4d.tar.gz | |
Remove broken workaround code for old mock.
Mock <= 1.0.1 was indeed broken on 3.4, but unittest.mock from 3.4 is
just as (or more) broken. Mock is now fixed, so don't play games with
the global state of the import system.
Change-Id: I5e04b773d33c63d5cf06ff60c321de70de453b69
Closes-Bug: #1488252
Partial-Bug: #1463867
Diffstat (limited to 'ironic/tests/__init__.py')
| -rw-r--r-- | ironic/tests/__init__.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/ironic/tests/__init__.py b/ironic/tests/__init__.py index dc0376e03..918237d30 100644 --- a/ironic/tests/__init__.py +++ b/ironic/tests/__init__.py @@ -32,14 +32,3 @@ eventlet.monkey_patch(os=False) # The code below enables nosetests to work with i18n _() blocks import six.moves.builtins as __builtin__ setattr(__builtin__, '_', lambda x: x) - -# NOTE(viktors): We can't use mock as third-party library in python 3.4 because -# of bug https://code.google.com/p/mock/issues/detail?id=234 -# so let's use mock from standard library in python 3.x -import six - -if six.PY3: - import sys - import unittest.mock - - sys.modules['mock'] = unittest.mock |