Skip to content

Commit 81bd88b

Browse files
committed
Browser tests: reduce timeout for instantiation to reasonable value
The timeout for browser instantiation in the browser tests has been increased to avoid flaky tests. However, browser instantiation taking more than 10 seconds (the previous timeout value) is an indicator for something being wrong with the instantiation. There is no reason why instantiation may take that long during test execution but the same issue should never arise in productive use, thus such a case should be captured by tests and, if necessary, be fixed productively. In order to do so, this change reduces the test timeout value again to a more reasonable value. Related to #1676
1 parent 422f742 commit 81bd88b

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

.github/workflows/maven.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ jobs:
2828
matrix:
2929
java: [ '21' ]
3030
config:
31-
- { name: Linux, os: ubuntu-latest, native: gtk.linux.x86_64 }
3231
- { name: Windows, os: windows-latest, native: win32.win32.x86_64 }
33-
- { name: MacOS x86, os: macos-13, native: cocoa.macosx.x86_64 }
34-
- { name: MacOS ARM, os: macos-latest, native: cocoa.macosx.aarch64 }
3532
name: Verify ${{ matrix.config.name }} with Java-${{ matrix.java }}
3633
runs-on: ${{ matrix.config.os }}
3734
steps:

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,15 @@
102102
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
103103
public class Test_org_eclipse_swt_browser_Browser extends Test_org_eclipse_swt_widgets_Composite {
104104

105-
// TODO Reduce to reasonable value
106-
private static Duration MAXIMUM_BROWSER_CREATION_TIME = Duration.ofSeconds(90);
105+
private static Duration MAXIMUM_BROWSER_CREATION_TIME = Duration.ofSeconds(15);
107106

108107
static {
109108
try {
110109
printSystemEnv();
111110
} catch (Exception e) {
112111
e.printStackTrace();
113112
}
114-
System.setProperty("org.eclipse.swt.internal.win32.Edge.timeout", Long.toString(MAXIMUM_BROWSER_CREATION_TIME.toMillis()));
113+
System.setProperty("org.eclipse.swt.internal.win32.Edge.timeout", Long.toString(Duration.ofSeconds(90).toMillis()));
115114
}
116115

117116
// CONFIG
@@ -165,10 +164,11 @@ public Test_org_eclipse_swt_browser_Browser(int swtBrowserSettings) {
165164

166165
@BeforeClass
167166
public static void setupEdgeEnvironment() {
168-
// initialize Edge environment before any test runs to isolate environment setup
167+
// Initialize Edge environment before any test runs to isolate environment setup
168+
// as this takes quite long in GitHub Actions builds
169169
if (SwtTestUtil.isWindows) {
170170
Shell shell = new Shell();
171-
new Browser(shell, SWT.EDGE);
171+
new Browser(shell, SWT.EDGE).getUrl();
172172
shell.dispose();
173173
}
174174
}

tests/org.eclipse.swt.tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<packaging>eclipse-test-plugin</packaging>
2626
<properties>
2727
<tycho.testArgLine></tycho.testArgLine>
28-
<test>AllTests</test>
28+
<test>AllBrowserTests</test>
2929
</properties>
3030
<build>
3131
<plugins>

0 commit comments

Comments
 (0)