Bug 633709: Convert bogus assert into a warning. r+a=ehsan
authorKyle Huey <khuey@kylehuey.com>
Sat, 19 Feb 2011 17:49:23 -0500
changeset 62874 5ba5ed2e239d2972e29bea25435ca85f47cf35f8
parent 62873 0a195cda5293e5a63fe958d0aa72b1ab81646ae4
child 62875 6f544597b3305e781067a771b2f766c72501e6ee
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs633709
milestone2.0b12pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 633709: Convert bogus assert into a warning. r+a=ehsan
editor/libeditor/base/nsEditor.cpp
editor/libeditor/html/crashtests/crashtests.list
editor/libeditor/text/crashtests/crashtests.list
editor/txmgr/tests/crashtests/crashtests.list
--- a/editor/libeditor/base/nsEditor.cpp
+++ b/editor/libeditor/base/nsEditor.cpp
@@ -668,17 +668,17 @@ nsEditor::DoTransaction(nsITransaction *
     }
     if (NS_SUCCEEDED(result)) {
       result = DoAfterDoTransaction(aTxn);
     }
 
     selPrivate->EndBatchChanges(); // no need to check result here, don't lose result of operation
   }
  
-  NS_POSTCONDITION((NS_SUCCEEDED(result)), "transaction did not execute properly");
+  NS_ENSURE_SUCCESS(result, result);
 
   return result;
 }
 
 
 NS_IMETHODIMP
 nsEditor::EnableUndo(PRBool aEnable)
 {
--- a/editor/libeditor/html/crashtests/crashtests.list
+++ b/editor/libeditor/html/crashtests/crashtests.list
@@ -6,17 +6,17 @@ load 418923-1.html
 load 420439.html
 load 428489-1.html
 asserts(0-16) load 431086-1.xhtml # Bug 439258
 load 448329-1.html
 load 448329-2.html
 load 448329-3.html
 load 456727-1.html
 load 456727-2.html
-needs-focus asserts(2) load 467647-1.html # bug 382210, bug 414178
+needs-focus asserts(1) load 467647-1.html # bug 414178
 load 499844-1.html
 load 503709-1.xhtml
 load 513375-1.xhtml
 load 535632-1.xhtml
 load 574558-1.xhtml
 load 582138-1.xhtml
 load 612565-1.html
 asserts(6) load 615015-1.html # Bug 439258
--- a/editor/libeditor/text/crashtests/crashtests.list
+++ b/editor/libeditor/text/crashtests/crashtests.list
@@ -1,2 +1,2 @@
-load 403965-1.xhtml
-asserts(6) load 580151-1.xhtml # Bug 439258
+asserts(6) load 403965-1.xhtml # Bug 439258, but also charged to the wrong test
+load 580151-1.xhtml
--- a/editor/txmgr/tests/crashtests/crashtests.list
+++ b/editor/txmgr/tests/crashtests/crashtests.list
@@ -1,2 +1,2 @@
-needs-focus asserts(3) load 407072-1.html # bug 382210?
+needs-focus load 407072-1.html
 load 449006-1.html