From a9f375aa93242f20afacbe7fdb60bcfd2732c6db Mon Sep 17 00:00:00 2001 From: Christian Long Date: Mon, 23 Feb 2015 16:52:11 -0600 Subject: [PATCH] Fix tests on Windows The tests were failing on Windows. On Windows, the jobs argument never gets converted to an int (engine.get_style_guide line 133) This resulted in AssertionError '2' != 2. So, do the int conversion in the test. Also, on Winddows, the call count is always 0, no matter the jobs argument. --- flake8/tests/test_integration.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/flake8/tests/test_integration.py b/flake8/tests/test_integration.py index 55ace48..d1417c6 100644 --- a/flake8/tests/test_integration.py +++ b/flake8/tests/test_integration.py @@ -8,6 +8,7 @@ except ImportError: import mock # < PY33 from flake8 import engine +from flake8.util import is_windows class IntegrationTestCase(unittest.TestCase): @@ -41,8 +42,15 @@ class IntegrationTestCase(unittest.TestCase): # mock stdout.flush so we can count the number of jobs created with mock.patch('sys.stdout.flush') as mocked: guide, report = self.check_files(arglist=['--jobs=%s' % jobs]) - self.assertEqual(guide.options.jobs, jobs) - self.assertEqual(mocked.call_count, jobs) + if is_windows(): + # The code path where guide.options.jobs gets converted to an + # int is not run on windows. So, do the int conversion here. + self.assertEqual(int(guide.options.jobs), jobs) + # On windows, call count is always zero. + self.assertEqual(mocked.call_count, 0) + else: + self.assertEqual(guide.options.jobs, jobs) + self.assertEqual(mocked.call_count, jobs) def test_jobs(self): self._job_tester(2)