Merge lp:~freyes/charm-helpers/mock into lp:charm-helpers

[Felipe Reyes]

Dear Charmers,

This MP solves a problem we are getting with mock 1.1.3

======================================================================
ERROR: Failure: ImportError (cannot import name wraps)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/sed-support/.venv/local/lib/python2.7/site-packages/nose/loader.py", line 418, in loadTestsFromName
    addr.filename, addr.module)
  File "/tmp/sed-support/.venv/local/lib/python2.7/site-packages/nose/importer.py", line 47, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/tmp/sed-support/.venv/local/lib/python2.7/site-packages/nose/importer.py", line 94, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/sed-support/tests/tools/test_charm_helper_sync.py", line 2, in <module>
    from mock import call, patch
  File "/tmp/sed-support/.venv/local/lib/python2.7/site-packages/mock/__init__.py", line 2, in <module>
    import mock.mock as _mock
  File "/tmp/sed-support/.venv/local/lib/python2.7/site-packages/mock/mock.py", line 68, in <module>
    from six import wraps
ImportError: cannot import name wraps

Thanks,

[Chris Glass (tribaal)]

There are no versions of mock between 1.0.1 and 1.1.0 AFAIK, so this does nothing.

Like was stated in the previous commit message, you need to destroy and recreate your venvs for things to work:

rm -r .venv
rm -r .venv3

review: Needs Fixing

[Chris Glass (tribaal)]

Oh, it's merged already? Ah well.

=== modified file 'test_requirements.txt'
--- test_requirements.txt	2015-07-15 09:11:59 +0000
+++ test_requirements.txt	2015-07-15 17:04:39 +0000
@@ -3,7 +3,7 @@
 pip
 distribute
 coverage>=3.6
-mock==1.0.1
+mock>=1.0.1,<1.1.0
 nose>=1.3.1
 flake8
 testtools==0.9.14  # Before dependent on modern 'six'