commit e244de942318903bb13c76b6210f1e78dc5f689e
author Zemiao Zhu <zemiao@google.com> Fri May 22 00:20:20 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 22 00:20:20 2020 +0000
tree 94658ad42e3a5c8292e1cd3c103d513ca00bdcd1
parent b8cc1efe7e25abb5c96c7d63749401ce3d4360ef
parent d11b7e9b8d56847dce47c0ced731eebff1186bde

Fix FileCopyUiTest failure because of Virtual SD Card not ejected am: d11b7e9b8d

Change-Id: Ie9e4b3a53862e843f68e3c2e4bdaf7e009837b10

tests/functional/com/android/documentsui/FileCopyUiTest.java

diff --git a/tests/functional/com/android/documentsui/FileCopyUiTest.java b/tests/functional/com/android/documentsui/FileCopyUiTest.java
index 79c109d..d052721 100644
--- a/tests/functional/com/android/documentsui/FileCopyUiTest.java
+++ b/tests/functional/com/android/documentsui/FileCopyUiTest.java
@@ -30,6 +30,7 @@
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.provider.Settings;
+import android.support.test.uiautomator.UiObjectNotFoundException;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -172,27 +173,38 @@
     public void tearDown() throws Exception {
         // Delete created files
         deleteDocuments(mDeviceLabel);
-        deleteDocuments(mSdCardLabel);
+        try {
+            deleteDocuments(mSdCardLabel);
+        } catch (UiObjectNotFoundException e) {
+            Log.d(TAG, "SD Card ejected unexpectedly. ", e);
+            mSdCardRoot = null;
+            mSdCardLabel = null;
+        }
 
         for (RootAndFolderPair rootAndFolder : mFoldersToCleanup) {
             deleteDocuments(rootAndFolder.root, rootAndFolder.folder);
         }
 
         // Eject virtual SD card
-        if (mIsVirtualSdCard) {
+        if (mIsVirtualSdCard && mSdCardRoot != null) {
             device.executeShellCommand("sm set-virtual-disk false");
-            while (mSdCardRoot != null) {
+            int attempts = 0;
+            while (mSdCardRoot != null && attempts++ < 15) {
                 List<RootInfo> rootList = mStorageDocsHelper.getRootList();
+                boolean sdCardRootHidden = true;
                 for (RootInfo info : rootList) {
                     if (info.isSd()) {
+                        sdCardRootHidden = false;
                         SystemClock.sleep(1000);
                         break;
                     }
-
+                }
+                if (sdCardRootHidden) {
                     mSdCardRoot = null;
                     mSdCardLabel = null;
                 }
             }
+            assertNull("Cannot eject virtual SD Card", mSdCardRoot);
         }
 
         device.executeShellCommand("settings put global stay_on_while_plugged_in "