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

Exclude all directories instead of only known ones

Browse Source 
The previous known directories seem to be removed in some case and
breaks the test.  Since the intention is to exclude directories and
compare existing files, exclude all directories instead.

Test: atest ApkVerityTest
Bug: 149469433
Change-Id: Ib096062b5647920b90f7d9d5638226392a2df174
This commit is contained in:
Victor Hsieh
2020-02-13 09:28:59 -08:00
parent e98ae477cc
commit 116b91c2c1
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/ApkVerityTest/src/com/android/apkverity/ApkVerityTest.java
View File

@@ -430,10 +430,9 @@ public class ApkVerityTest extends BaseHostJUnit4Test {
private void verifyInstalledFiles(String... filenames) throws DeviceNotAvailableException {
String apkPath = getApkPath(TARGET_PACKAGE);
String appDir = apkPath.substring(0, apkPath.lastIndexOf("/"));
// Exclude directories since we only care about files.
HashSet<String> actualFiles = new HashSet<>(Arrays.asList(
expectRemoteCommandToSucceed("ls " + appDir).split("\n")));
assertTrue(actualFiles.remove("lib"));
assertTrue(actualFiles.remove("oat"));
expectRemoteCommandToSucceed("ls -p " + appDir + " | grep -v '/'").split("\n")));
HashSet<String> expectedFiles = new HashSet<>(Arrays.asList(filenames));
assertEquals(expectedFiles, actualFiles);