Merge pull request #63 from badoo/remove_uninstalled_apps_from_hashmap

Remove app from installed apps cache
badoo · Jul 4, 2024 · 9858db7 · 9858db7
2 parents 298e63c + e8b4a80
commit 9858db7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/marathon-gradle-plugin/src/main/kotlin/com/malinskiy/marathon/ConfigurationFactory.kt b/marathon-gradle-plugin/src/main/kotlin/com/malinskiy/marathon/ConfigurationFactory.kt
@@ -3,7 +3,6 @@ package com.malinskiy.marathon
 import com.malinskiy.marathon.android.AndroidConfiguration
 import com.malinskiy.marathon.android.DEFAULT_APPLICATION_PM_CLEAR
 import com.malinskiy.marathon.android.DEFAULT_AUTO_GRANT_PERMISSION
-import com.malinskiy.marathon.android.DEFAULT_DEVICE_CLEANUP_SCRIPT
 import com.malinskiy.marathon.android.DEFAULT_INSTALL_OPTIONS
 import com.malinskiy.marathon.android.DEFAULT_USED_STORAGE_THRESHOLD_PERCENTS
 import com.malinskiy.marathon.android.defaultInitTimeoutMillis
@@ -98,7 +97,6 @@ private fun createAndroidConfiguration(
             }
         }
         ?: SerialStrategy.AUTOMATIC
-    val cleanupDeviceScript = extension.cleanupDeviceScript ?: DEFAULT_DEVICE_CLEANUP_SCRIPT
     val usedStorageThresholdInPercents = extension.usedStorageThresholdInPercents ?: DEFAULT_USED_STORAGE_THRESHOLD_PERCENTS
 
     return AndroidConfiguration(
@@ -114,7 +112,6 @@ private fun createAndroidConfiguration(
         installOptions,
         preferableRecorderType,
         serialStrategy,
-        cleanupDeviceScript,
         usedStorageThresholdInPercents
     )
 }
diff --git a/marathon-gradle-plugin/src/main/kotlin/com/malinskiy/marathon/MarathonExtension.kt b/marathon-gradle-plugin/src/main/kotlin/com/malinskiy/marathon/MarathonExtension.kt
@@ -55,7 +55,6 @@ open class MarathonExtension {
     //Android specific for now
     var autoGrantPermission: Boolean? = null
     var instrumentationArgs: MutableMap<String, String> = mutableMapOf()
-    var cleanupDeviceScript: String? = null
     var usedStorageThresholdInPercents: Int? = null
 
     //Kotlin way

diff --git a/...endor-android/base/src/main/kotlin/com/malinskiy/marathon/android/AndroidConfiguration.kt b/...endor-android/base/src/main/kotlin/com/malinskiy/marathon/android/AndroidConfiguration.kt
@@ -13,8 +13,7 @@ const val DEFAULT_AUTO_GRANT_PERMISSION = false
 const val DEFAULT_APPLICATION_PM_CLEAR = false
 const val DEFAULT_TEST_APPLICATION_PM_CLEAR = false
 const val DEFAULT_INSTALL_OPTIONS = ""
-const val DEFAULT_USED_STORAGE_THRESHOLD_PERCENTS = 80
-const val DEFAULT_DEVICE_CLEANUP_SCRIPT = "pm list packages -3 | grep -E '\\.test\$' | tr -d '\\r' | cut -d ':' -f 2 | xargs -n1 -t pm uninstall"
+const val DEFAULT_USED_STORAGE_THRESHOLD_PERCENTS = 85
 
 data class AndroidConfiguration(
     val androidSdk: File,
@@ -29,7 +28,6 @@ data class AndroidConfiguration(
     val installOptions: String = DEFAULT_INSTALL_OPTIONS,
     val preferableRecorderType: DeviceFeature? = null,
     val serialStrategy: SerialStrategy = SerialStrategy.AUTOMATIC,
-    val cleanupDeviceScript: String = DEFAULT_DEVICE_CLEANUP_SCRIPT,
     val usedStorageThresholdInPercents: Int = DEFAULT_USED_STORAGE_THRESHOLD_PERCENTS
 ) : VendorConfiguration {
 

diff --git a/...ndor-android/ddmlib/src/main/kotlin/com/malinskiy/marathon/android/AndroidAppInstaller.kt b/...ndor-android/ddmlib/src/main/kotlin/com/malinskiy/marathon/android/AndroidAppInstaller.kt
@@ -19,6 +19,7 @@ class AndroidAppInstaller(
         private const val MAX_RETIRES = 3
         private const val MARSHMALLOW_VERSION_CODE = 23
         private const val MD5_HASH_SIZE = 32
+        private const val INSTALLED_TEST_APPS_SCRIPT = "pm list packages -3 | grep -E '\\.test\$' | tr -d '\\r' | cut -d ':' -f 2"
         private const val PACKAGE_PREFIX = "package:"
     }
 
@@ -79,9 +80,20 @@ class AndroidAppInstaller(
         val usedStorageThresholdInPercents = androidConfiguration.usedStorageThresholdInPercents
         if (storageUsedPercentage > usedStorageThresholdInPercents) {
             logger.warn { "On ${device.serialNumber} used more than $usedStorageThresholdInPercents% of storage" }
-            androidConfiguration.cleanupDeviceScript.let {
-                logger.info { "Launching cleanup shell script `$it`" }
-                device.safeExecuteShellCommand(it).let { logger.info { it } }
+            val appsToClean = device.safeExecuteShellCommand(INSTALLED_TEST_APPS_SCRIPT).lines()
+            logger.info { "Removing ${appsToClean.size} apps on ${device.serialNumber}" }
+            appsToClean.forEach {
+                try {
+                    val result = device.safeUninstallPackage(it)
+                    if (result == "Success") {
+                        logger.info { "Uninstalled $it - $result" }
+                        installedApps[device.serialNumber]?.remove(it)
+                    } else {
+                        logger.error { "Error while uninstalling $it on ${device.serialNumber} : $result" }
+                    }
+                } catch (ignored: Throwable) {
+                    logger.error(ignored) { "Error while uninstalling $it on ${device.serialNumber}" }
+                }
             }
         }
     }