diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 16:40:25 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 16:40:25 +0000 |
| commit | aaba916106408b2654958ec6b74d7bb81ab19eb5 (patch) | |
| tree | b104627279b0b6d4c94b771561279522b3e4f01b | |
| parent | 0c9b02747555165ffd6b03ba3f850679f0962ad7 (diff) | |
| download | chromium_src-aaba916106408b2654958ec6b74d7bb81ab19eb5.zip chromium_src-aaba916106408b2654958ec6b74d7bb81ab19eb5.tar.gz chromium_src-aaba916106408b2654958ec6b74d7bb81ab19eb5.tar.bz2 | |
Fix pyauto autofill tests that were depending on sys.stdout.encoding,
which is not defined when piping the output of the tests.
BUG=81271
TEST=none
Review URL: http://codereview.chromium.org/8267017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106298 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/functional/PYAUTO_TESTS | 6 | ||||
| -rw-r--r-- | chrome/test/functional/autofill_dataset_converter.py | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS index 4edf217..639224f 100644 --- a/chrome/test/functional/PYAUTO_TESTS +++ b/chrome/test/functional/PYAUTO_TESTS @@ -134,9 +134,6 @@ # ================================================== # Disabled tests that need to be investigated/fixed. # ================================================== - # crbug.com/81271 - '-autofill.AutofillTest.testMergeAggregatedProfilesWithSameAddress', - '-autofill.AutofillTest.testProfilesNotMergedWhenNoMinAddressData', # Some download test fails on win official builder, only thru buildbot # when downloading the small zip file. # crbug.com/91225 @@ -303,9 +300,6 @@ # ================================================== # Disabled tests that need to be investigated/fixed. # ================================================== - # crbug.com/81271 - '-autofill.AutofillTest.testMergeAggregatedProfilesWithSameAddress', - '-autofill.AutofillTest.testProfilesNotMergedWhenNoMinAddressData', # crosbug.com/19556 '-autofill.AutofillTest.testDisplayLineItemForEntriesWithNoCCNum', '-autofill.AutofillTest.testPostalCodeAndStateLabelsBasedOnCountry', diff --git a/chrome/test/functional/autofill_dataset_converter.py b/chrome/test/functional/autofill_dataset_converter.py index 9db7f58..f3f2bea 100644 --- a/chrome/test/functional/autofill_dataset_converter.py +++ b/chrome/test/functional/autofill_dataset_converter.py @@ -167,10 +167,8 @@ class DatasetConverter(object): if output_file:
output_file.write(output_line)
output_file.write(os.linesep)
- self._logger.info('%d: %s' % (i, line.encode(sys.stdout.encoding,
- 'ignore')))
- self._logger.info('\tconverted to: %s' %
- output_line.encode(sys.stdout.encoding, 'ignore'))
+ self._logger.info('%d: %s' % (i, line.encode('UTF-8')))
+ self._logger.info('\tconverted to: %s' % output_line.encode('UTF-8'))
if output_file:
output_file.write(']')
output_file.write(os.linesep)
|