From 54e1aa7ed790fef4da09c5fd4cec70ef7cf2af15 Mon Sep 17 00:00:00 2001 From: "tiger@opera.com" Date: Wed, 18 Dec 2013 12:04:34 +0000 Subject: Disable three DomSerializerTests in preperation of page serializer merge This CL fixes my mistake in https://codereview.chromium.org/115163002/ where I prepended the tests with 'DISABLE_' instead of 'DISABLED_'. It also disables one additional test that will not work due to the merge. R=jochen BUG=328354 Review URL: https://codereview.chromium.org/106023004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241545 0039d316-1c4b-4281-b951-d872f2087c98 --- content/renderer/dom_serializer_browsertest.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'content') diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index 738bcd9..b7d82b7 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc @@ -816,7 +816,12 @@ IN_PROC_BROWSER_TEST_F(DomSerializerTests, SerializeHTMLDOMWithoutDocType) { // Serialize XML document which has all 5 built-in entities. After // finishing serialization, the serialized contents should be same // with original XML document. -IN_PROC_BROWSER_TEST_F(DomSerializerTests, SerializeXMLDocWithBuiltInEntities) { +// +// TODO(tiger@opera.com): Disabled in preparation of page serializer merge -- +// XML headers are handled differently in the merged serializer. +// Bug: http://crbug.com/328354 +IN_PROC_BROWSER_TEST_F(DomSerializerTests, + DISABLED_SerializeXMLDocWithBuiltInEntities) { base::FilePath page_file_path = GetTestFilePath("dom_serializer", "note.html"); base::FilePath xml_file_path = GetTestFilePath("dom_serializer", "note.xml"); @@ -919,7 +924,7 @@ IN_PROC_BROWSER_TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInText) { // Some attributes are handled differently in the merged serializer. // Bug: http://crbug.com/328354 IN_PROC_BROWSER_TEST_F(DomSerializerTests, - DISABLE_SerializeHTMLDOMWithEntitiesInAttributeValue) { + DISABLED_SerializeHTMLDOMWithEntitiesInAttributeValue) { // Need to spin up the renderer and also navigate to a file url so that the // renderer code doesn't attempt a fork when it sees a load to file scheme // from non-file scheme. @@ -958,7 +963,7 @@ IN_PROC_BROWSER_TEST_F(DomSerializerTests, // Base tags are handled a bit different in merged version. // Bug: http://crbug.com/328354 IN_PROC_BROWSER_TEST_F(DomSerializerTests, - DISABLE_SerializeHTMLDOMWithBaseTag) { + DISABLED_SerializeHTMLDOMWithBaseTag) { base::FilePath page_file_path = GetTestFilePath( "dom_serializer", "html_doc_has_base_tag.htm"); -- cgit v1.1