Unset COLUMNS for test_argparse (and restore afterwards) (issue 9553)

diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index f01c65fbea4acac88678e8d8ca41c7a46b0c6376..08dd91ba4b6de1839cdc2974a793a5a5a918a231 100644 (file)
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -26,6 +26,13 @@ class TestCase(unittest.TestCase):
             print(obj2)
         super(TestCase, self).assertEqual(obj1, obj2)
 
+    def setUp(self):
+        # The tests assume that line wrapping occurs at 80 columns, but this
+        # behaviour can be overridden by setting the COLUMNS environment
+        # variable.  To ensure that this assumption is true, unset COLUMNS.
+        env = support.EnvironmentVarGuard()
+        env.unset("COLUMNS")
+        self.addCleanup(env.__exit__)
 
 
 class TempDirMixin(object):
@@ -1715,6 +1722,7 @@ class TestAddSubparsers(TestCase):
         return parser
 
     def setUp(self):
+        super().setUp()
         self.parser = self._get_parser()
         self.command_help_parser = self._get_parser(subparser_help=True)
 
@@ -1942,6 +1950,7 @@ class TestParentParsers(TestCase):
         self.assertRaises(ArgumentParserError, *args, **kwargs)
 
     def setUp(self):
+        super().setUp()
         self.wxyz_parent = ErrorRaisingArgumentParser(add_help=False)
         self.wxyz_parent.add_argument('--w')
         x_group = self.wxyz_parent.add_argument_group('x')