Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't fail #getSnapshotDirectories siliently (2/n)"

Browse Source
This commit is contained in:
JW Wang
2020-10-14 12:35:57 +00:00
committed by Android (Google) Code Review
parent 51b8f1c90a cde1a0fce0
commit 5657694a20
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java
View File

@@ -27,6 +27,7 @@ import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
import com.android.ddmlib.Log;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.IFileEntry;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
@@ -53,6 +54,7 @@ import java.util.stream.Collectors;
*/
@RunWith(DeviceJUnit4ClassRunner.class)
public class StagedRollbackTest extends BaseHostJUnit4Test {
private static final String TAG = "StagedRollbackTest";
private static final int NATIVE_CRASHES_THRESHOLD = 5;
/**
@@ -556,16 +558,18 @@ public class StagedRollbackTest extends BaseHostJUnit4Test {
return String.format("/data/user_de/%d/%s", userId, apexName);
}
private List<String> getSnapshotDirectories(String baseDir) {
try {
return getDevice().getFileEntry(baseDir).getChildren(false)
.stream().filter(entry -> entry.getName().matches("\\d+(-prerestore)?"))
.map(entry -> entry.getFullPath())
.collect(Collectors.toList());
} catch (Exception e) {
// Return an empty list if any error
private List<String> getSnapshotDirectories(String baseDir) throws Exception {
IFileEntry f = getDevice().getFileEntry(baseDir);
if (f == null) {
Log.d(TAG, "baseDir doesn't exist: " + baseDir);
return Collections.EMPTY_LIST;
}
List<String> list = f.getChildren(false)
.stream().filter(entry -> entry.getName().matches("\\d+(-prerestore)?"))
.map(entry -> entry.getFullPath())
.collect(Collectors.toList());
Log.d(TAG, "getSnapshotDirectories=" + list);
return list;
}
private void assertDirectoryIsEmpty(String path) {