Fix up and un-skip the test for bug 406572, following up on a comment in bug 577325. r=jorendorff
authorJeff Walden <jwalden@mit.edu>
Sun, 29 Jan 2012 03:03:18 -0800
changeset 114997 5e31a0fc42bed8b33902f6a77baf40d12b812f5a
parent 114996 758c495dae14009c1428d308e5b1c79f3c201b25
child 114998 c67ff8ae77e29628f52bc7e75983160dccf251c7
push idunknown
push userunknown
push dateunknown
reviewersjorendorff
bugs406572, 577325
milestone19.0a1
Fix up and un-skip the test for bug 406572, following up on a comment in bug 577325. r=jorendorff
content/canvas/test/test_mozGetAsFile.html
js/src/tests/js1_5/extensions/regress-406572.js
--- a/js/src/tests/js1_5/extensions/regress-406572.js
+++ b/js/src/tests/js1_5/extensions/regress-406572.js
@@ -1,44 +1,37 @@
-// |reftest| skip
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 406572;
 var summary = 'JSOP_CLOSURE unconditionally replaces properties of the variable object - Browser only';
 var actual = '';
 var expect = '';
 
 printBugNumber(BUGNUMBER);
 printStatus (summary);
 
 if (typeof window != 'undefined')
 {
-  try
-  {
-    expect = 'TypeError: redeclaration of const document';
-    var d = document;
+  var d = document;
 
-    d.writeln(uneval(document));
-    document = 1;
-    d.writeln(uneval(document));
+  d.writeln(uneval(document));
+  document = 1;
+  d.writeln(uneval(document));
 
-    if (1) 
-      function document() { return 1; }
+  if (1)
+    function document() { return 1; }
 
-    d.writeln(uneval(document));
-  }
-  catch(ex)
-  {
-    actual = ex + '';
-    print(actual);
-  }
+  d.writeln(uneval(document));
+
+  // The test harness relies on document having its original value: restore it.
+  document = d;
 }
 else
 {
   expect = actual = 'Test can only run in a Gecko 1.9 browser or later.';
   print(actual);
 }
 reportCompare(expect, actual, summary);