diff options
author | Leonardo Schäffer <leonardo.schaffer@gmail.com> | 2015-06-25 11:20:44 -0300 |
---|---|---|
committer | Leonardo Schäffer <leonardo.schaffer@gmail.com> | 2015-06-25 11:20:44 -0300 |
commit | 42f31aa607750eb7c00224e7c1c353b27cbd7519 (patch) | |
tree | 4bbfae731c8427c526f22bacb9136e5ed3e69d8c /service/test/unit/maintenance | |
parent | 7f349abe67b8e1a71798478f6c26b08773f2d869 (diff) | |
parent | 0b179c61043a9854fa23b8fd40fd252864ecd021 (diff) |
Merge branch 'master' into floatlabel_for_compose
Diffstat (limited to 'service/test/unit/maintenance')
-rw-r--r-- | service/test/unit/maintenance/test_commands.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/service/test/unit/maintenance/test_commands.py b/service/test/unit/maintenance/test_commands.py index 6f993106..f1bf6e45 100644 --- a/service/test/unit/maintenance/test_commands.py +++ b/service/test/unit/maintenance/test_commands.py @@ -22,7 +22,7 @@ from leap.mail.imap.account import SoledadBackedAccount from leap.mail.imap.fields import WithMsgFields from leap.soledad.client import Soledad from leap.soledad.common.document import SoledadDocument -from mock import MagicMock, ANY +from mock import MagicMock from os.path import join, dirname from twisted.internet import defer, reactor |