Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2016-11-24 18:32:39 +0000
committerMarkus Keller2016-11-24 18:32:39 +0000
commit02a28be3bc720c6864be45d4d3fbb0cffa0b0a1d (patch)
treee99ce72d21e8305982c3df6c4efb175864fcc2e4
parent09d30f30084300e07eba508cf1d7e799b7af82f1 (diff)
downloadeclipse.platform.swt-M20161124-1400.tar.gz
eclipse.platform.swt-M20161124-1400.tar.xz
eclipse.platform.swt-M20161124-1400.zip
Bug 499159: [GTK 2] Test_BrowserSuite.testBrowser3 fails with WebKit behind proxyR4_6_2M20161124-1400
-rw-r--r--tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Test_BrowserSuite.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Test_BrowserSuite.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Test_BrowserSuite.java
index 47802f1d85..3af2a1fe6b 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Test_BrowserSuite.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Test_BrowserSuite.java
@@ -31,7 +31,9 @@ import org.junit.rules.TestName;
*/
public class Test_BrowserSuite {
-public static boolean isRunningOnEclipseOrgHudsonGTK = SwtTestUtil.isGTK && "hudsonbuild".equalsIgnoreCase(System.getProperty("user.name"));
+public static boolean isRunningOnEclipseOrgHudsonGTK = SwtTestUtil.isGTK
+ && ("hudsonbuild".equalsIgnoreCase(System.getProperty("user.name"))
+ || "genie.platform".equalsIgnoreCase(System.getProperty("user.name")));
@Rule public TestName name = new TestName();
@@ -56,7 +58,7 @@ private static boolean logXulRunnerVersion() {
public void testBrowser1() {
logXulRunnerVersion();
if (isRunningOnEclipseOrgHudsonGTK) {
- System.out.println("Test_BrowserSuite.testBrowser1() skipped, see bug 465721");
+ System.out.println("Test_BrowserSuite." + name.getMethodName() + "() skipped, see bug 499159");
return;
}
assertTrue(Browser1.test());
@@ -69,6 +71,10 @@ public void testBrowser2() {
@Test
public void testBrowser3() {
+ if (isRunningOnEclipseOrgHudsonGTK) {
+ System.out.println("Test_BrowserSuite." + name.getMethodName() + "() skipped, see bug 499159");
+ return;
+ }
assertTrue(Browser3.test());
}
@@ -89,7 +95,7 @@ public void testBrowser5() {
@Test
public void testBrowser6() {
if (isRunningOnEclipseOrgHudsonGTK) {
- System.out.println("Test_BrowserSuite.testBrowser1() skipped, see bug 465721");
+ System.out.println("Test_BrowserSuite." + name.getMethodName() + "() skipped, see bug 499159");
return;
}
assertTrue(Browser6.test());

Back to the top