Preventing crash and removing promise delay

zebrunner · Aug 17, 2023 · f5b74c6 · f5b74c6
1 parent 489ad70
commit f5b74c6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/lib/units/ios-device/plugins/screen/stream.js b/lib/units/ios-device/plugins/screen/stream.js
@@ -106,8 +106,14 @@ module.exports = syrup.serial()
             } 
 
             // #770: Reset rotation to Portrait when closing device
-            WdaClient.rotation({orientation: 'PORTRAIT'})
-            Promise.delay(3000).then(() => stoppingSession())
+
+            const rotationPromise = new Promise((resolve, reject) => {
+              // Ensure that rotation is done, then stop session
+              WdaClient.rotation({orientation: 'PORTRAIT'})
+              resolve()
+            })
+
+            rotationPromise.then(() => stoppingSession())
         })
         ws.on('error', function() {
           // @TODO handle error event

diff --git a/lib/units/ios-device/plugins/wda/WdaClient.js b/lib/units/ios-device/plugins/wda/WdaClient.js
@@ -646,13 +646,23 @@ module.exports = syrup.serial()
               return resolve(response)
             })
             .catch(err => {
+              let errMes = err.error.value.message
+
               // #762: Skip lock error message 
-              if (err.error.value.message.includes('Timed out while waiting until the screen gets locked')) {
+              if (errMes.includes('Timed out while waiting until the screen gets locked')) {
                 return
               }
-              if (err.error.value.message.includes('Unable To Rotate Device')) {
+
+              // #765: Skip rotation error message 
+              if (errMes.includes('Unable To Rotate Device')) {
                 return log.info('The current application does not support rotation')
               }
+
+              // #770 Skip session crash, immediately restart after Portrait mode reset
+              if (errMes.includes('Session does not exist')) {
+                return this.startSession()
+              }
+
               recoverDevice()
               // #409: capture wda/appium crash asap and exit with status 1 from stf
               //notifier.setDeviceTemporaryUnavialable(err)