Fix test program for python 2.7

--output and --output-file should work for python 2.7 now.

Author: dnozay

tests/testsuite.py

@@ -856,7 +856,6 @@ def test_write(self):
         self.assertEqual(wrote, len(self.getSecondContent()))
 
 
-@unittest.skipIf(sys.version_info[0] < 3, 'Python 3 required')
 class XMLProgramTestCase(unittest.TestCase):
     @mock.patch('sys.argv', ['xmlrunner', '-o', 'flaf'])
     @mock.patch('xmlrunner.runner.XMLTestRunner')
@@ -865,16 +864,38 @@ def test_xmlrunner_output(self, exiter, testrunner):
         xmlrunner.runner.XMLTestProgram()
 
         kwargs = dict(
-            buffer=False,
-            failfast=False,
-            verbosity=1,
-            warnings='default',
+            buffer=mock.ANY,
+            failfast=mock.ANY,
+            verbosity=mock.ANY,
+            warnings=mock.ANY,
             output='flaf',
         )
 
         if sys.version_info[:2] > (3, 4):
-            kwargs.update(tb_locals=False)
+            kwargs.update(tb_locals=mock.ANY)
 
         testrunner.assert_called_once_with(**kwargs)
+        exiter.assert_called_once_with(False)
+
+    @mock.patch('sys.argv', ['xmlrunner', '--output-file', 'test.xml'])
+    @mock.patch('xmlrunner.runner.open')
+    @mock.patch('xmlrunner.runner.XMLTestRunner')
+    @mock.patch('sys.exit')
+    def test_xmlrunner_output_file(self, exiter, testrunner, opener):
+        xmlrunner.runner.XMLTestProgram()
+        opener.assert_called_once_with('test.xml', 'wb')
+        opener().close.assert_called()
 
+        kwargs = dict(
+            buffer=mock.ANY,
+            failfast=mock.ANY,
+            verbosity=mock.ANY,
+            warnings=mock.ANY,
+            output=opener('test.xml', 'wb'),
+        )
+
+        if sys.version_info[:2] > (3, 4):
+            kwargs.update(tb_locals=mock.ANY)
+
+        testrunner.assert_called_once_with(**kwargs)
         exiter.assert_called_once_with(False)

xmlrunner/runner.py

@@ -117,22 +117,44 @@ def run(self, test):
 
 
 class XMLTestProgram(TestProgram):
-    output = None
 
     def __init__(self, *args, **kwargs):
         kwargs.setdefault('testRunner', XMLTestRunner)
+        self.warnings = None  # python2 fix
+        self._parseKnownArgs(kwargs)
         super(XMLTestProgram, self).__init__(*args, **kwargs)
 
+    def _parseKnownArgs(self, kwargs):
+        argv = kwargs.get('argv')
+        if argv is None:
+            argv = sys.argv
+
+        # python2 argparse fix
+        parser = argparse.ArgumentParser(prog='xmlrunner')
+        group = parser.add_mutually_exclusive_group()
+        group.add_argument(
+            '-o', '--output', metavar='DIR',
+            help='Directory for storing XML reports (\'.\' default)')
+        group.add_argument(
+            '--output-file', metavar='FILENAME',
+            help='Filename for storing XML report')
+        namespace, argv = parser.parse_known_args(argv)
+        self.output = namespace.output
+        self.output_file = namespace.output_file
+        kwargs['argv'] = argv
+
     def _initArgParsers(self):
+        # this code path is only called in python3 (optparse vs argparse)
         super(XMLTestProgram, self)._initArgParsers()
 
         for parser in (self._main_parser, self._discovery_parser):
             group = parser.add_mutually_exclusive_group()
-            group.add_argument('-o', '--output', metavar='DIR',
-                                help='Directory for storing XML reports '
-                                "('.' default)")
-            group.add_argument('--output-file', metavar='FILENAME',
-                                help='Filename for storing XML report')
+            group.add_argument(
+                '-o', '--output', metavar='DIR', nargs=1,
+                help='Directory for storing XML reports (\'.\' default)')
+            group.add_argument(
+                '--output-file', metavar='FILENAME', nargs=1,
+                help='Filename for storing XML report')
 
     def runTests(self):
         kwargs = dict(