Skip to content

Bugfix: add another method to verify the status of windows driver #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhou9584 merged 4 commits into from
Jun 19, 2023
Merged

Bugfix: add another method to verify the status of windows driver #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e85c93f
Bugfix: add another method to verify the status of windows driver
zhou9584 Jun 19, 2023
afabd15
Update TestTaskService.java
zhou9584 Jun 19, 2023
e13f40c
Update AppiumRunner.java
zhou9584 Jun 19, 2023
b1d8768
Update TestTaskService.java
zhou9584 Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions agent/src/main/java/com/microsoft/hydralab/agent/runner/appium/AppiumRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public boolean startJunit(File appiumJarFile, String appiumCommand, AppiumListen
myClass = urlClassLoader.loadClass(appiumCommand);
junit.run(myClass);
return true;
} catch (ClassNotFoundException e) {
} catch (Exception e) {
e.printStackTrace();
return false;
}
Expand Down Expand Up @@ -176,7 +176,7 @@ public boolean startJunit5(File appiumJarFile, String appiumCommand, TestExecuti
launcher.registerTestExecutionListeners(listener);
launcher.execute(request);
return true;
} catch (ClassNotFoundException e) {
} catch (Exception e) {
e.printStackTrace();
return false;
}
Expand Down
1 change: 1 addition & 0 deletions center/src/main/java/com/microsoft/hydralab/center/service/TestTaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public Boolean isDeviceFree(String deviceIdentifier) {

@Scheduled(cron = "0 */3 * * * *")
public void runTask() {
logger.info("Start to run queued test task. the value of isRunning is: " + isRunning.get() + "the size of taskQueue is: " + taskQueue.size());
//only run one task at the same time
if (isRunning.get()) {
return;
Expand Down
15 changes: 14 additions & 1 deletion center/src/main/java/com/microsoft/hydralab/center/socket/CenterDeviceSocketEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@

import com.microsoft.hydralab.center.config.SpringApplicationListener;
import com.microsoft.hydralab.center.service.DeviceAgentManagementService;
import com.microsoft.hydralab.common.entity.common.Message;
import com.microsoft.hydralab.common.util.SerializeUtil;
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import javax.websocket.CloseReason;
import javax.websocket.OnClose;
import javax.websocket.OnError;
import javax.websocket.OnMessage;
Expand Down Expand Up @@ -47,8 +49,19 @@ public void onClose(Session session) {

@OnMessage
public void onMessage(ByteBuffer message, Session session) {
Message formattedMessage;
try {
deviceAgentManagementService.onMessage(SerializeUtil.byteArrToMessage(message.array()), session);
formattedMessage = SerializeUtil.byteArrToMessage(message.array());
} catch (Exception e) {
try {
session.close(new CloseReason(CloseReason.CloseCodes.CANNOT_ACCEPT, "Message format error"));
} catch (IOException ex) {
throw new RuntimeException(ex);
}
throw new RuntimeException(e);
}
try {
deviceAgentManagementService.onMessage(formattedMessage, session);
} catch (IOException e) {
throw new RuntimeException(e);
}
Expand Down
15 changes: 13 additions & 2 deletions common/src/main/java/com/microsoft/hydralab/common/management/AppiumServerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@
import org.openqa.selenium.net.UrlChecker;
import org.openqa.selenium.remote.DesiredCapabilities;
import org.slf4j.Logger;
import org.springframework.stereotype.Service;

import javax.annotation.Nonnull;
import java.io.*;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.time.Duration;
Expand Down Expand Up @@ -279,6 +282,14 @@ public WindowsDriver getWindowsRootDriver(Logger logger) {
public Boolean isDriverAlive(AppiumDriver driver) {
try {
driver.getStatus();
return true;
} catch (WebDriverException e) {
return false;
}
}

public Boolean isDriverAlive(WindowsDriver driver) {
try {
driver.getScreenshotAs(OutputType.FILE);
return true;
} catch (WebDriverException e) {
Expand Down