Commit 815521fc authored by Nick Coghlan's avatar Nick Coghlan

Correctly escape arbitrary error message text in the runpy unit tests

parent acccafcf
...@@ -3,6 +3,7 @@ import unittest ...@@ -3,6 +3,7 @@ import unittest
import os import os
import os.path import os.path
import sys import sys
import re
import tempfile import tempfile
from test.test_support import verbose, run_unittest, forget from test.test_support import verbose, run_unittest, forget
from test.script_helper import (temp_dir, make_script, compile_script, from test.script_helper import (temp_dir, make_script, compile_script,
...@@ -317,8 +318,7 @@ argv0 = sys.argv[0] ...@@ -317,8 +318,7 @@ argv0 = sys.argv[0]
self.assertEqual(result["__package__"], expected_package) self.assertEqual(result["__package__"], expected_package)
def _check_import_error(self, script_name, msg): def _check_import_error(self, script_name, msg):
# Double backslashes to handle path separators on Windows msg = re.escape(msg)
msg = msg.replace("\\", "\\\\")
self.assertRaisesRegexp(ImportError, msg, run_path, script_name) self.assertRaisesRegexp(ImportError, msg, run_path, script_name)
def test_basic_script(self): def test_basic_script(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment