-
-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[plugin-saucelabs] Add ability to wait for free device (#5722)
- Loading branch information
Showing
10 changed files
with
326 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
...us-extension-selenium/src/main/java/org/vividus/selenium/SessionCreationRetryHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Copyright 2019-2025 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.vividus.selenium; | ||
|
|
||
| import java.util.Optional; | ||
| import java.util.function.Supplier; | ||
|
|
||
| import org.openqa.selenium.SessionNotCreatedException; | ||
| import org.openqa.selenium.remote.RemoteWebDriver; | ||
|
|
||
| public interface SessionCreationRetryHandler | ||
| { | ||
| /** | ||
| * Checks whether the error from {@link SessionNotCreatedException} is recoverable. If it is, tries to create a | ||
| * new {@link RemoteWebDriver} using the provided factory. | ||
| * | ||
| * @param sessionNotCreatedException The original exception thrown when a session is not created at the first | ||
| * attempt. | ||
| * @param remoteWebDriverFactory The factory to create a new {@link RemoteWebDriver}. | ||
| * @return An {@link Optional} containing the new {@link RemoteWebDriver} if the error is recoverable, otherwise | ||
| * an empty {@link Optional}. | ||
| */ | ||
| Optional<RemoteWebDriver> handleError(SessionNotCreatedException sessionNotCreatedException, | ||
| Supplier<RemoteWebDriver> remoteWebDriverFactory); | ||
| } |
55 changes: 55 additions & 0 deletions
55
...m/src/main/java/org/vividus/selenium/SessionCreationRetryOnHttpConnectTimeoutHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * Copyright 2019-2025 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.vividus.selenium; | ||
|
|
||
| import java.util.Optional; | ||
| import java.util.function.Supplier; | ||
|
|
||
| import org.openqa.selenium.SessionNotCreatedException; | ||
| import org.openqa.selenium.remote.RemoteWebDriver; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class SessionCreationRetryOnHttpConnectTimeoutHandler implements SessionCreationRetryHandler | ||
| { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(SessionCreationRetryOnHttpConnectTimeoutHandler.class); | ||
|
|
||
| private final boolean retrySessionCreationOnHttpConnectTimeout; | ||
|
|
||
| public SessionCreationRetryOnHttpConnectTimeoutHandler(boolean retrySessionCreationOnHttpConnectTimeout) | ||
| { | ||
| this.retrySessionCreationOnHttpConnectTimeout = retrySessionCreationOnHttpConnectTimeout; | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<RemoteWebDriver> handleError(SessionNotCreatedException sessionNotCreatedException, | ||
| Supplier<RemoteWebDriver> remoteWebDriverFactory) | ||
| { | ||
| if (retrySessionCreationOnHttpConnectTimeout && isHttpConnectTimeout(sessionNotCreatedException)) | ||
| { | ||
| LOGGER.warn("Failed to create a new session due to HTTP connect timout", sessionNotCreatedException); | ||
| LOGGER.warn("Retrying to create a new session"); | ||
| return Optional.ofNullable(remoteWebDriverFactory.get()); | ||
| } | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| private static boolean isHttpConnectTimeout(SessionNotCreatedException e) | ||
| { | ||
| return e.getMessage().contains("Message: java.net.http.HttpConnectTimeoutException: HTTP connect timed out"); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
...bs/src/main/java/org/vividus/saucelabs/SessionCreationRetryOnConcurrencyLimitHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Copyright 2019-2025 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.vividus.saucelabs; | ||
|
|
||
| import java.time.Duration; | ||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
| import java.util.function.Supplier; | ||
|
|
||
| import org.openqa.selenium.SessionNotCreatedException; | ||
| import org.openqa.selenium.remote.RemoteWebDriver; | ||
| import org.vividus.selenium.SessionCreationRetryHandler; | ||
| import org.vividus.util.wait.DurationBasedWaiter; | ||
|
|
||
| public class SessionCreationRetryOnConcurrencyLimitHandler implements SessionCreationRetryHandler | ||
| { | ||
| private final Duration freeDeviceWaitTimeout; | ||
| private final Duration pollingTimeout; | ||
|
|
||
| public SessionCreationRetryOnConcurrencyLimitHandler(Duration freeDeviceWaitTimeout, Duration pollingTimeout) | ||
| { | ||
| this.freeDeviceWaitTimeout = freeDeviceWaitTimeout; | ||
| this.pollingTimeout = pollingTimeout; | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<RemoteWebDriver> handleError(SessionNotCreatedException sessionNotCreatedException, | ||
| Supplier<RemoteWebDriver> remoteWebDriverFactory) | ||
| { | ||
| if (!freeDeviceWaitTimeout.isZero() && isConcurrencyLimitExceeded(sessionNotCreatedException)) | ||
| { | ||
| RemoteWebDriver remoteWebDriver = new DurationBasedWaiter(freeDeviceWaitTimeout, pollingTimeout).wait( | ||
| () -> | ||
| { | ||
| try | ||
| { | ||
| return remoteWebDriverFactory.get(); | ||
| } | ||
| catch (SessionNotCreatedException e) | ||
| { | ||
| if (isConcurrencyLimitExceeded(e)) | ||
| { | ||
| return null; | ||
| } | ||
| throw e; | ||
| } | ||
| }, Objects::nonNull); | ||
| return Optional.ofNullable(remoteWebDriver); | ||
| } | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| private static boolean isConcurrencyLimitExceeded(SessionNotCreatedException sessionNotCreatedException) | ||
| { | ||
| return sessionNotCreatedException.getMessage().contains("CCYAbuse - too many jobs"); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.