Fixes failed tests in PackageManagerTests

- #testDeleteNormalInternalRetainData
  Removes the check for the directory. Test does not have
  the access right of the data folder of other packages.

- #testIsSignedBy
  Updates the correct public key for key set A.

Bug: 152007236
Test: atest PackageManagerTests
Change-Id: I4adbf5e1d321e7f4ed9f1005ec52eb1ea3d04c27
This commit is contained in:
Rhed Jao
2020-04-29 19:13:48 +08:00
parent 9689eda20f
commit a244a01bc9
2 changed files with 1 additions and 5 deletions

View File

@@ -1470,7 +1470,7 @@
<key-sets>
<key-set android:name="A" >
<public-key android:name="keyA"
android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ=="/>
android:value="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMpNthdOxud7roPDZMMomOqXgJJdRfIWpkKEqmC61Mv+Nf6QY3TorEwJeghjSmqj7IbBKrtvfQq4E2XJO1HuspmQO4Ng2gvn+r+6EwNfKc9k55d6s+27SR867jKurBbHNtZMG+tjL1yH4r+tNzcuJCsgyAFqLmxFdcxEwzNvREyRpoYc5RDR0mmTwkMCUhJ6CId1EYEKiCEdNzxv+fWPEb21u+/MWpleGCILs8kglRVb2q/WOzAAvGr4FY5plfaE6N+lr7+UschQ+aMi1+uqewo2o0qPFVmZP5hnwj55K4UMzu/NhhDqQQsX4cSGES1KgHo5MTqRqZjN/I7emw5pFQIDAQAB"/>
</key-set>
<upgrade-key-set android:name="A"/>
</key-sets>

View File

@@ -971,8 +971,6 @@ public class PackageManagerTests extends AndroidTestCase {
if (retainData) {
assertNotNull(info);
assertEquals(info.packageName, ip.pkg.packageName);
File file = new File(info.dataDir);
assertTrue(file.exists());
} else {
assertNull(info);
}
@@ -990,7 +988,6 @@ public class PackageManagerTests extends AndroidTestCase {
@LargeTest
@Suppress // TODO(b/152007236): un-suppress when we root cause this
public void testDeleteNormalInternalRetainData() throws Exception {
deleteFromRawResource(0, PackageManager.DELETE_KEEP_DATA);
}
@@ -2306,7 +2303,6 @@ public class PackageManagerTests extends AndroidTestCase {
}
}
@Suppress // TODO(b/152007236): un-suppress when we root cause this
public void testIsSignedBy() throws Exception {
PackageManager pm = getPm();
String mPkgName = mContext.getPackageName();