pre-commit/flake8
1
0
Fork 0
mirror of https://github.com/PyCQA/flake8.git synced 2026-04-11 15:24:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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

See merge request !33
This commit is contained in:
Ian Cordasco 2015-07-10 14:59:53 +00:00
commit d5c5feb651
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
flake8/tests/test_engine.py
View file

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

7
tox.ini
View file

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