changeset 8800:3673a70e0e5e 9-b52

[TEST] Workaround for failing tests until RT-40076 and RT-40077 are fixed
author kcr
date Fri, 20 Feb 2015 14:23:14 -0800
parents 1f4ed70c6498
children 7745aebafeeb 6b38b53369ff
files modules/web/src/test/java/javafx/scene/web/DebuggerTest.java modules/web/src/test/java/javafx/scene/web/IrresponsiveScriptTest.java
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/modules/web/src/test/java/javafx/scene/web/DebuggerTest.java	Fri Feb 20 14:23:14 2015 -0800
+++ b/modules/web/src/test/java/javafx/scene/web/DebuggerTest.java	Fri Feb 20 14:23:14 2015 -0800
@@ -32,11 +32,13 @@
 import javafx.util.Callback;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.After;
 
 public class DebuggerTest extends TestBase {
 
+    @Ignore("RT-40076")
     @Test
     public void testSimpleMessageExchange() {
         submit(() -> {
--- a/modules/web/src/test/java/javafx/scene/web/IrresponsiveScriptTest.java	Fri Feb 20 14:23:14 2015 -0800
+++ b/modules/web/src/test/java/javafx/scene/web/IrresponsiveScriptTest.java	Fri Feb 20 14:23:14 2015 -0800
@@ -25,15 +25,20 @@
 
 package javafx.scene.web;
 
+import com.sun.javafx.PlatformUtil;
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadMXBean;
 import javafx.event.EventHandler;
 import netscape.javascript.JSException;
+import org.junit.Assume;
 import org.junit.Test;
 
 public class IrresponsiveScriptTest extends TestBase {
 
     @Test public void testInfiniteLoopInScript() {
+        // Ignore test on Linux until RT-40077 is fixed
+        Assume.assumeTrue(!PlatformUtil.isLinux());
+
         try {
             // This infinite loop should get interrupted by Webkit in about 10s.
             // If it doesn't, test times out.