Skip to content

Commit 17ec90b

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 17ec90b

File tree

4 files changed

+2
-18
lines changed

4 files changed

+2
-18
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/AllBrowserTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@
1515

1616

1717
import org.eclipse.test.TracingSuite;
18-
import org.eclipse.test.TracingSuite.TracingOptions;
1918
import org.junit.runner.JUnitCore;
2019
import org.junit.runner.RunWith;
2120
import org.junit.runners.Suite;
2221

2322
@RunWith(TracingSuite.class)
24-
@TracingOptions(stackDumpTimeoutSeconds = 60)
2523
@Suite.SuiteClasses({
2624
Test_org_eclipse_swt_browser_Browser.class,
2725
})

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
import org.eclipse.swt.widgets.Shell;
8383
import org.eclipse.swt.widgets.Text;
8484
import org.junit.Before;
85-
import org.junit.BeforeClass;
8685
import org.junit.FixMethodOrder;
8786
import org.junit.Ignore;
8887
import org.junit.Rule;
@@ -103,7 +102,7 @@
103102
public class Test_org_eclipse_swt_browser_Browser extends Test_org_eclipse_swt_widgets_Composite {
104103

105104
// 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(10);
107106

108107
static {
109108
try {
@@ -163,16 +162,6 @@ public Test_org_eclipse_swt_browser_Browser(int swtBrowserSettings) {
163162
this.swtBrowserSettings = swtBrowserSettings;
164163
}
165164

166-
@BeforeClass
167-
public static void setupEdgeEnvironment() {
168-
// initialize Edge environment before any test runs to isolate environment setup
169-
if (SwtTestUtil.isWindows) {
170-
Shell shell = new Shell();
171-
new Browser(shell, SWT.EDGE);
172-
shell.dispose();
173-
}
174-
}
175-
176165
@Override
177166
@Before
178167
public void setUp() {

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)