Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Issue 1255223003: Revert of Enable and fix tests after page serializer merge (Closed)

Created:
5 years, 4 months ago by Alexander Alekseev
Modified:
5 years, 4 months ago
CC:
asanka, benjhayden+dwatch_chromium.org, chromium-reviews, jshin+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

(closed as the problem was fixed in another CL) Revert of Enable and fix tests after page serializer merge (patchset #1 id:1 of https://codereview.chromium.org/1219923010/) Reason for revert: BrowserEncodingTest.TestEncodingAutoDetect is dead since this CL, so cros_trunk bot is constantly red. See http://test-results.appspot.com/dashboards/flakiness_dashboard.html#testType=browser_tests&tests=BrowserEncodingTest.TestEncodingAutoDetect . Original issue's description: > Enable and fix tests after page serializer merge > > Enable and fix two SavePageBrowserTests and two BrowserEncodingTest that > where removed in <https://codereview.chromium.org/1218743006/>; in > preparation of the page serializer merger in > <https://codereview.chromium.org/1177733003/>;. > > Patch from gustav.tiger@sonymobile.com > > R=jochen@chromium.org, rdsmith@chromium.org > BUG=328354 > > Committed: https://chromium.googlesource.com/chromium/src/+/bbf281076da0c593ec9d586eb78b2498581d070e TBR=jochen@chromium.org,rdsmith@chromium.org,gustav.tiger@sonymobile.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=328354

Patch Set 1 #

Messages

Total messages: 5 (2 generated)
Alexander Alekseev
Created Revert of Enable and fix tests after page serializer merge
5 years, 4 months ago (2015-07-27 20:45:24 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1255223003/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1255223003/1
5 years, 4 months ago (2015-07-27 20:46:53 UTC) #2
commit-bot: I haz the power
5 years, 4 months ago (2015-07-27 20:48:15 UTC) #4
Failed to apply patch for
chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html:
While running git apply --index -3 -p1;
  error: patch failed:
chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html:17
  Falling back to three-way merge...
  error: patch failed:
chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html:17
  error:
chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html:
patch does not apply

Patch:      
chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
Index:
chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
diff --git
a/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
b/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
index
0d530cd5fe860a3e0fbeaa4430cd4f488cb00620..4e2107db46dd2259eef504f32a811e7b7aee0cc0
100644
---
a/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
+++
b/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
@@ -17,5 +17,4 @@

Íò½Ý£¬ÑŲýÆóÒµ¼¯ÍÅÓÐÏÞ¹«Ë¾¶­Ê³¤£¬Ëû´´ÔìÐÔ½«´«Í³Ó¡Ë¢ÒµÓëÏÖ´úIT¼¼ÊõÍêÃÀÈںϣ¬ÔÚ±ÏÉý·¢Ã÷Ó¡Ë¢Êõ900¶àÄêºó£¬ËûΪӡˢÊõµÄ¹ÊÏçÖØÐÂÓ®µÃÁ˽¾°ÁºÍ×ðÑÏ£»
 

º«Èýƽ£¬ÖйúµçÓ°¼¯ÍŹ«Ë¾¶­Ê³¤£¬´Ó¡¶ÎÞ¼«¡·¡¢¡¶Í¶Ãû×´¡·µ½¡¶³à±Ú¡·¡¢¡¶Ã·À¼·¼¡·£¬Óɺ«ÈýƽÁìµ¼µÄÖÐÓ°ÍŶÓʹÖйúµçÓ°¿ªÊ¼½øÈë³ÉÊìµÄ´óƬʱ´ú£»
-
 </body></html>
\ No newline at end of file

Powered by Google App Engine
This is Rietveld 408576698