diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index b7f268b2..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "python.linting.enabled": false, - "python.testing.unittestArgs": [ - "-v", - "-s", - "./test", - "-p", - "test_*.py" - ], - "python.testing.pytestEnabled": false, - "python.testing.unittestEnabled": true -} diff --git a/test/test_autopep8.py b/test/test_autopep8.py index 1a6947b7..40b65465 100755 --- a/test/test_autopep8.py +++ b/test/test_autopep8.py @@ -5836,6 +5836,7 @@ def test_parallel_jobs_with_diff_option(self): ['--jobs=3', '--diff'], stdout=PIPE) p.wait() output = p.stdout.read().decode() + output = output.replace("\r\n","\n") # windows compatibility p.stdout.close() actual_diffs = [] @@ -5844,9 +5845,9 @@ def test_parallel_jobs_with_diff_option(self): --- original/{filename} +++ fixed/{filename} @@ -1 +1 @@ --'abc' +-'abc' {blank} +'abc' -""".format(filename=filename)) +""".format(filename=filename, blank="")) # in case the users IDE trims leaning whitespace self.assertEqual(p.returncode, autopep8.EXIT_CODE_OK) for actual_diff in actual_diffs: self.assertIn(actual_diff, output)