Fix race condition in a more efficient way

python · freakboy3742 · Aug 16, 2024 · Jul 10, 2024 · Jul 10, 2024 · Jul 10, 2024
commit c9d5bf59b4180ce0ea48691c8496de8d6a46487e
@@ -450,6 +450,10 @@ async def logcat_task(context, initial_devices):
             raise CalledProcessError(status, args, "".join(hidden_output))
 
 
+def stop_app(serial):
+    run([adb, "-s", serial, "shell", "am", "force-stop", APP_ID], log=False)
+
+
 async def gradle_task(context):
     env = os.environ.copy()
     if context.managed:
@@ -486,6 +490,10 @@ async def gradle_task(context):
         if hidden_output and not logcat_started:
             sys.stdout.write("".join(hidden_output))
 
+        # Gradle does not stop the tests when interrupted.
+        if context.connected:
+            stop_app(context.connected)
+
 
 async def run_testbed(context):
     if not adb.exists():
@@ -501,25 +509,11 @@ async def run_testbed(context):
         # find_device then waits for a new device to appear.
         initial_devices = await list_devices()
     else:
-        # Gradle normally uninstalls the app after the tests finish, but let's
-        # make certain, otherwise we might show logs from a previous run. This
-        # is unnecessary in --managed mode, because Gradle creates a new
-        # emulator every time.
-        removed = False
-        for package in [f"{APP_ID}.test", APP_ID]:
-            status = run(
-                [adb, "-s", context.connected, "uninstall", package],
-                log=False, stdout=DEVNULL, stderr=DEVNULL, check=False
-            ).returncode
-            if status == 0:
-                removed = True
-
-        # There appears to be a race condition where if you uninstall and then
-        # immediately reinstall, the next run may fail with no output.
-        if removed:
-            print("Waiting for uninstall of old version")
-            sleep(10)  # 5 seconds is not enough.
-
+        # In case the previous shutdown was unclean, make sure the app isn't
+        # running, otherwise we might show logs from a previous run. This is
+        # unnecessary in --managed mode, because Gradle creates a new emulator
+        # every time.
+        stop_app(context.connected)
         initial_devices = None
 
     try:

@@ -20,4 +20,9 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+
+# By default, the app will be uninstalled after the tests finish (apparently
+# after 10 seconds in case of an unclean shutdown). We disable this, because
+# when using android.py it can conflict with the installation of the next run.
+android.injected.androidTest.leaveApksInstalledAfterRun=true