Merge branch 'fix-mock-tests' into 'master'

Fix flake8 tests using mock to work with 1.1.x branch

See merge request !33

flake8/tests/test_engine.py

@@ -52,7 +52,7 @@ class TestEngine(unittest.TestCase):
             self.assertTrue(len(registered_exts[0]) > 0)
             for i in registered_exts[1:]:
                 self.assertTrue(isinstance(i, list))
-            register_check.assert_called()
+            self.assertTrue(register_check.called)
 
     def test_get_parser(self):
         # setup
@@ -67,13 +67,13 @@ class TestEngine(unittest.TestCase):
         # actual call we're testing
         parser, hooks = engine.get_parser()
         # assertions
-        re.assert_called()
-        gpv.assert_called()
+        self.assertTrue(re.called)
+        self.assertTrue(gpv.called)
         pgp.assert_called_once_with(
             'flake8',
             '%s (pyflakes: 0.7, mccabe: 0.2) Python Version' % __version__)
-        m.remove_option.assert_called()
-        m.add_option.assert_called()
+        self.assertTrue(m.remove_option.called)
+        self.assertTrue(m.add_option.called)
         self.assertEqual(parser, m)
         self.assertEqual(hooks, [])
         # clean-up

tox.ini

@@ -6,13 +6,18 @@ envlist =
 [testenv]
 usedevelop = True
 deps =
-    mock<1.1.0
+    mock
     nose
 commands =
     python setup.py test -q
     python setup.py flake8
     nosetests flake8.tests._test_warnings
 
+[testenv:py26]
+deps =
+  mock==1.0.1
+  nose
+
 [testenv:py27-flake8]
 basepython = python2.7
 deps =