Merge branch 'two-commits-lol'

hhatto · Mar 6, 2022 · 3ab866b · 3ab866b
2 parents d8e0233 + 23944ff
commit 3ab866b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git 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)