Skip to content

Commit d9c7148

Browse files
committed
[ci] Stop skipping some tests that are green and fast now
1 parent f085ea2 commit d9c7148

File tree

3 files changed

+12
-30
lines changed

3 files changed

+12
-30
lines changed

.skipped-tests

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,11 @@
1010
-//dotnet/test/support/UI:SelectTests
1111
-//java/test/org/openqa/selenium/bidi/browsingcontext:BrowsingContextTest
1212
-//java/test/org/openqa/selenium/bidi/browsingcontext:BrowsingContextTest-remote
13-
-//java/test/org/openqa/selenium/bidi/log:LogInspectorTest-remote
14-
-//java/test/org/openqa/selenium/bidi:BiDiSessionTest-remote
15-
-//java/test/org/openqa/selenium/bidi:BiDiTest-remote
1613
-//java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest
1714
-//java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote
18-
-//java/test/org/openqa/selenium/devtools:CdpFacadeTest-remote
19-
-//java/test/org/openqa/selenium/devtools:ChangeUserAgentTest-remote
20-
-//java/test/org/openqa/selenium/devtools:DevToolsReuseTest-remote
21-
-//java/test/org/openqa/selenium/devtools:JavascriptExceptionsTest-remote
22-
-//java/test/org/openqa/selenium/devtools:NetworkInterceptorRestTest-chrome-remote
23-
-//java/test/org/openqa/selenium/devtools:NetworkInterceptorTest-chrome-remote
2415
-//java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest
2516
-//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest
26-
-//java/test/org/openqa/selenium/firefox:RemoteFirefoxDriverTest-remote
2717
-//java/test/org/openqa/selenium/grid/gridui:OverallGridTest
28-
-//java/test/org/openqa/selenium/grid/router:RemoteWebDriverBiDiTest
2918
-//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest
3019
-//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest-chrome
3120
-//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest-chrome-remote
@@ -34,7 +23,6 @@
3423
-//java/test/org/openqa/selenium/interactions:DefaultMouseTest-remote
3524
-//java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest
3625
-//java/test/org/openqa/selenium/remote:RemoteWebDriverScreenshotTest-remote
37-
-//java/test/org/openqa/selenium:FormHandlingTest-chrome
3826
-//javascript/atoms:test-chrome
3927
-//javascript/atoms:test-firefox-beta
4028
-//javascript/atoms:test-firefox-dev

java/test/org/openqa/selenium/grid/gridui/OverallGridTest.java

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,31 +49,20 @@
4949
import org.openqa.selenium.remote.http.HttpRequest;
5050
import org.openqa.selenium.remote.http.HttpResponse;
5151
import org.openqa.selenium.support.ui.FluentWait;
52-
import org.openqa.selenium.support.ui.Wait;
53-
import org.openqa.selenium.support.ui.WebDriverWait;
52+
import org.openqa.selenium.testing.JupiterTestBase;
5453
import org.openqa.selenium.testing.drivers.Browser;
55-
import org.openqa.selenium.testing.drivers.WebDriverBuilder;
5654

57-
class OverallGridTest {
55+
class OverallGridTest extends JupiterTestBase {
5856

5957
private Server<?> server;
60-
private WebDriver driver;
61-
private WebDriver remoteWebDriver;
62-
private Wait<WebDriver> wait;
6358

6459
@BeforeEach
6560
public void setup() {
6661
server = createStandalone();
67-
68-
driver = new WebDriverBuilder().get();
69-
70-
wait = new WebDriverWait(driver, Duration.ofSeconds(10));
7162
}
7263

7364
@AfterEach
7465
public void tearDown() {
75-
safelyCall(() -> driver.quit());
76-
safelyCall(() -> remoteWebDriver.quit());
7766
safelyCall(() -> server.stop());
7867
}
7968

@@ -101,10 +90,15 @@ void shouldShowOneNodeRegistered() {
10190

10291
@Test
10392
void shouldIncrementSessionCountWhenSessionStarts() {
104-
remoteWebDriver = new RemoteWebDriver(server.getUrl(), Browser.detect().getCapabilities());
105-
driver.get(whereIs(server, "/ui#/sessions"));
106-
107-
wait.until(textToBe(By.cssSelector("div[data-testid='session-count']"), "1"));
93+
WebDriver remoteWebDriver =
94+
new RemoteWebDriver(server.getUrl(), Browser.detect().getCapabilities());
95+
try {
96+
driver.get(whereIs(server, "/ui#/sessions"));
97+
98+
wait.until(textToBe(By.cssSelector("div[data-testid='session-count']"), "1"));
99+
} finally {
100+
remoteWebDriver.quit();
101+
}
108102
}
109103

110104
private Server<?> createStandalone() {

scripts/github-actions/ci-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ bazel test --config=remote-ci --build_tests_only \
1818
--keep_going --flaky_test_attempts=2 \
1919
//dotnet/... \
2020
//java/... \
21-
//javascript/atoms/... //javascript/selenium-atoms/... //javascript/webdriver/... \
21+
//javascript/atoms/... //javascript/webdriver/... \
2222
//py/... -- $(cat .skipped-tests | tr '\n' ' ')
2323
# Build the packages we want to ship to users
2424
bazel build --config=remote-ci //dotnet:all java/src/... //javascript/node/selenium-webdriver:selenium-webdriver //py:selenium-wheel

0 commit comments

Comments
 (0)