Bugfix: isDriverAlive method can't verify the staus of iosDriver (#511)

* Bugfix: isDriverAlive method can't verify the staus of iosDriver

* Update TestRunDeviceOrchestrator.java

Author: zhou9584

agent/src/main/java/com/microsoft/hydralab/agent/runner/TestRunDeviceOrchestrator.java

@@ -272,6 +272,20 @@ public void addGifFrameAsyncDelay(@NotNull TestRunDevice testRunDevice, @NotNull
         });
     }
 
+    private void addGifFrameSyncDelay(@NotNull TestRunDevice testRunDevice, @NotNull File screenshotDir, int delaySeconds, @NotNull Logger logger) {
+        ThreadUtils.safeSleep(TimeUnit.SECONDS.toMillis(delaySeconds));
+        File imageFile = getScreenShot(testRunDevice, screenshotDir, logger);
+        if (imageFile == null || !testRunDevice.getGifEncoder().isStarted()) {
+            return;
+        }
+        try {
+            testRunDevice.getGifEncoder().addFrame(ImgUtil.toBufferedImage(ImgUtil.scale(ImageIO.read(imageFile), 0.3f)));
+            testRunDevice.setGifFrameCount(testRunDevice.getGifFrameCount() + 1);
+        } catch (IOException e) {
+            logger.error("Failed to add frame to gif", e);
+        }
+    }
+
     public void grantAllTaskNeededPermissions(@NotNull TestRunDevice testRunDevice, @NotNull TestTask testTask, @Nullable Logger logger) {
         if (testRunDevice instanceof TestRunDeviceCombo) {
             ((TestRunDeviceCombo) testRunDevice).getDevices()
@@ -294,7 +308,7 @@ public void stopGitEncoder(@NotNull TestRunDevice testRunDevice, @NotNull File s
             return;
         }
         if (testRunDevice.getGifFrameCount() < 2) {
-            addGifFrameAsyncDelay(testRunDevice, screenshotDir, 0, logger);
+            addGifFrameSyncDelay(testRunDevice, screenshotDir, 0, logger);
         }
         testRunDevice.getGifEncoder().finish();
     }

common/src/main/java/com/microsoft/hydralab/common/management/AppiumServerManager.java

@@ -140,9 +140,6 @@ public IOSDriver getIOSDriver(DeviceInfo deviceInfo, Logger logger) {
         int tryTimes = 3;
         boolean sessionCreated = false;
         while (tryTimes > 0 && !sessionCreated) {
-            if (iosDriver != null) {
-                iosDriver.quit();
-            }
             tryTimes--;
             try {
                 iosDriver = new IOSDriver(new URL(String.format("http://%s:%d/wd/hub", appiumServerHost, appiumServerPort)), caps);
@@ -288,6 +285,15 @@ public Boolean isDriverAlive(AppiumDriver driver) {
         }
     }
 
+    public Boolean isDriverAlive(IOSDriver driver) {
+        try {
+            driver.unlockDevice();
+            return true;
+        } catch (WebDriverException e) {
+            return false;
+        }
+    }
+
     public Boolean isDriverAlive(WindowsDriver driver) {
         try {
             driver.getScreenshotAs(OutputType.FILE);

common/src/main/java/com/microsoft/hydralab/common/screen/IOSAppiumScreenRecorderForMac.java

@@ -5,6 +5,7 @@
 import com.microsoft.hydralab.common.entity.common.DeviceInfo;
 import com.microsoft.hydralab.common.management.device.DeviceDriver;
 import com.microsoft.hydralab.common.util.Const;
+import com.microsoft.hydralab.common.util.FlowUtil;
 import com.microsoft.hydralab.common.util.ThreadUtils;
 import io.appium.java_client.ios.IOSStartScreenRecordingOptions;
 
@@ -26,14 +27,17 @@ public IOSAppiumScreenRecorderForMac(DeviceDriver deviceDriver, DeviceInfo info,
     public void startRecord(int maxTimeInSecond) {
         int timeout = maxTimeInSecond > 0 ? maxTimeInSecond : DEFAULT_TIMEOUT_IN_SECOND;
         try {
-            iosDriver.startRecordingScreen(new IOSStartScreenRecordingOptions()
-                    .enableForcedRestart()
-                    .withFps(24)
-                    .withVideoType("h264")
-                    .withVideoScale("720:360")
-                    .withTimeLimit(Duration.ofSeconds(timeout)));
+            FlowUtil.retryAndSleepWhenFalse(3, 1000, () -> {
+                iosDriver.startRecordingScreen(new IOSStartScreenRecordingOptions()
+                        .enableForcedRestart()
+                        .withFps(24)
+                        .withVideoType("h264")
+                        .withVideoScale("720:360")
+                        .withTimeLimit(Duration.ofSeconds(timeout)));
+                return true;
+            });
             isStarted = true;
-        } catch (Throwable e) {
+        } catch (Exception e) {
             System.out.println("-------------------------------Fail to Start recording, Ignore it to unblocking the following tests----------------------------");
             e.printStackTrace();
             System.out.println("-------------------------------------------------------Ignore End--------------------------------------------------------------");