Add more logs to ADB exceptions

badoo · Aug 28, 2024 · d8a9c85 · d8a9c85
1 parent ae097c0
commit d8a9c85
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/...d/ddmlib/src/main/kotlin/com/malinskiy/marathon/android/ddmlib/AndroidDeviceTestRunner.kt b/...d/ddmlib/src/main/kotlin/com/malinskiy/marathon/android/ddmlib/AndroidDeviceTestRunner.kt
@@ -56,11 +56,13 @@ class AndroidDeviceTestRunner(private val device: DdmlibAndroidDevice) {
  listener.testRunEnded(0, emptyMap())
  }
  } catch (e: ShellCommandUnresponsiveException) {
- logger.warn(ERROR_STUCK, e)
- listener.testRunFailed(ERROR_STUCK)
+ val errorMessage = "adb unresponsive while running tests ${testBatch.tests.map { it.toTestName() }}"
+ logger.error(e) { errorMessage }
+ listener.testRunFailed(errorMessage)
  } catch (e: TimeoutException) {
- logger.warn(ERROR_STUCK, e)
- listener.testRunFailed(ERROR_STUCK)
+ val errorMessage = "adb timed out while running tests ${testBatch.tests.map { it.toTestName() }}"
+ logger.error(e) { errorMessage }
+ listener.testRunFailed(errorMessage)
  } catch (e: AdbCommandRejectedException) {
  val errorMessage = "adb error while running tests ${testBatch.tests.map { it.toTestName() }}"
  logger.error(e) { errorMessage }

diff --git a/...droid/ddmlib/src/main/kotlin/com/malinskiy/marathon/android/ddmlib/DdmlibAndroidDevice.kt b/...droid/ddmlib/src/main/kotlin/com/malinskiy/marathon/android/ddmlib/DdmlibAndroidDevice.kt
@@ -103,13 +103,13 @@ class DdmlibAndroidDevice(
  try {
  ddmsDevice.safeExecuteShellCommand(command, nullOutputReceiver)
  } catch (e: TimeoutException) {
- logger.error(errorMessage, e)
+ logger.error("$errorMessage while executing $command", e)
  } catch (e: AdbCommandRejectedException) {
- logger.error(errorMessage, e)
+ logger.error("$errorMessage while executing $command", e)
  } catch (e: ShellCommandUnresponsiveException) {
- logger.error(errorMessage, e)
+ logger.error("$errorMessage while executing $command", e)
  } catch (e: IOException) {
- logger.error(errorMessage, e)
+ logger.error("$errorMessage while executing $command", e)
  }
  }