[swtoolkit] r70 committed - Making runtest_test more tolerant of different versions of optparse...

[codesite...@google.com]

Revision: 70
Author: bradn...@google.com
Date: Fri Sep 17 11:31:45 2010
Log: Making runtest_test more tolerant of different versions of optparse
which have different casing in print_help output.

Review URL: http://codereview.chromium.org/3382009
http://code.google.com/p/swtoolkit/source/detail?r=70

Modified:
/trunk/test/runtest_test.py

=======================================
--- /trunk/test/runtest_test.py Mon Mar 2 17:01:36 2009
+++ /trunk/test/runtest_test.py Fri Sep 17 11:31:45 2010
@@ -31,7 +31,9 @@
"""Test runtest (hey, recursion!) (MEDIUM TEST)."""

import TestFramework
+import optparse
import os
+import StringIO
import sys

@@ -99,8 +101,11 @@
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:')