Making runtest_test more tolerant of different versions of optparse...

test/runtest_test.py

 #!/usr/bin/python2.4
 # Copyright 2009, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 13 matching lines @@
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 """Test runtest (hey, recursion!) (MEDIUM TEST)."""
 
 import TestFramework
+import optparse
 import os
+import StringIO
 import sys
 
 
 expect_stdout = """usage: runtest.py [options]
 
 options:
   -a, --all             Run all tests; does a virtual 'find' for all tests
                         under the current directory.
   -d, --debug           Runs the script under the Python debugger (pdb.py) so
                         you don't have to muck with PYTHONPATH yourself.
@@ skipping 47 matching lines @@
   # Convert test args to a list, so we can add args with spaces below
   runtest = runtest.split()
 
   test = TestFramework.TestFramework(program=sys.executable)
 
   base = 'runtest/'
   test.subdir(base)
   test.write('dummy_test.py', dummy_test_contents)
   test.write('other.py', other_py_contents)
 
-  # On mac, help output is slightly different
-  if sys.platform == 'darwin':
+  # Alter expected result based on optparse version (string case changed).
+  op = optparse.OptionParser()
+  fh = StringIO.StringIO()
+  op.print_help(fh)
+  if 'Usage:' in fh.getvalue():
     global expect_stdout
     expect_stdout = expect_stdout.replace('usage:', 'Usage:')
     expect_stdout = expect_stdout.replace('options:', 'Options:')
 
   # Check help
   test.run(arguments=runtest + ['--help'], stdout=expect_stdout)
 
   # Check running itself but doing nothing
   test.run(arguments=runtest + ['-n', '-a'])
 
@@ skipping 18 matching lines @@
   test.FakeWindowsPFX(base + 'fake1.pfx')
   test.must_exist(base + 'fake1.pfx')
 
   test.pass_test()
 
   return 0
 
 
 if __name__ == '__main__':
   main()