From: <st...@us...> - 2008-07-25 06:43:30
|
Author: strank Date: 2008-07-25 08:43:16 +0200 (Fri, 25 Jul 2008) New Revision: 5616 Modified: branches/abolish-userstring-haskey/test/test_parsers/test_rst/test_directives/test_raw.py branches/abolish-userstring-haskey/test/test_parsers/test_rst/test_directives/test_tables.py Log: Special-case tests with IOError on older python versions. Modified: branches/abolish-userstring-haskey/test/test_parsers/test_rst/test_directives/test_raw.py =================================================================== --- branches/abolish-userstring-haskey/test/test_parsers/test_rst/test_directives/test_raw.py 2008-07-24 17:20:41 UTC (rev 5615) +++ branches/abolish-userstring-haskey/test/test_parsers/test_rst/test_directives/test_raw.py 2008-07-25 06:43:16 UTC (rev 5616) @@ -157,7 +157,7 @@ <literal_block xml:space="preserve"> .. raw:: html :file: non-existent.file -"""], +"""], # note that this output is rewritten below for certain python versions ] # Skip tests whose output contains "UnicodeDecodeError" if we are not @@ -171,7 +171,17 @@ # Assume we have only one of these tests. break +# Rewrite tests that depend on the output of IOError as it is +# platform-dependent before python 2.4 for a unicode path. +if sys.version_info < (2, 4): + # remove the unicode repr u except for py2.3 on windows: + if not sys.platform.startswith('win') or sys.version_info < (2, 3): + for i in range(len(totest['raw'])): + if totest['raw'][i][1].find("u'non-existent.file'") != -1: + totest['raw'][i][1] = totest['raw'][i][1].replace( + "u'non-existent.file'", "'non-existent.file'") + if __name__ == '__main__': import unittest unittest.main(defaultTest='suite') Modified: branches/abolish-userstring-haskey/test/test_parsers/test_rst/test_directives/test_tables.py =================================================================== --- branches/abolish-userstring-haskey/test/test_parsers/test_rst/test_directives/test_tables.py 2008-07-24 17:20:41 UTC (rev 5615) +++ branches/abolish-userstring-haskey/test/test_parsers/test_rst/test_directives/test_tables.py 2008-07-25 06:43:16 UTC (rev 5616) @@ -566,7 +566,7 @@ <literal_block xml:space="preserve"> .. csv-table:: no such file :file: bogus.csv -"""], +"""], # note that this output is rewritten below for certain python versions ["""\ .. csv-table:: bad URL :url: bogus.csv @@ -1074,6 +1074,18 @@ ] +if csv: + # Rewrite csv tests that depend on the output of IOError as it is + # platform-dependent before python 2.4 for a unicode path. + # Here only needed for python 2.3 on non-windows + import sys + if sys.version_info < (2, 4) and not sys.platform.startswith('win'): + for i in range(len(totest['csv-table'])): + if totest['csv-table'][i][1].find("u'bogus.csv'") != -1: + totest['csv-table'][i][1] = totest['csv-table'][i][1].replace( + "u'bogus.csv'", "'bogus.csv'") + + if __name__ == '__main__': import unittest unittest.main(defaultTest='suite') |