Merge "Remote TF refactor part one."
diff --git a/prod-tests/src/com/android/framework/tests/PackageManagerOTATestUtils.java b/prod-tests/src/com/android/framework/tests/PackageManagerOTATestUtils.java
index 9bfe9e3..5efcf31 100644
--- a/prod-tests/src/com/android/framework/tests/PackageManagerOTATestUtils.java
+++ b/prod-tests/src/com/android/framework/tests/PackageManagerOTATestUtils.java
@@ -82,7 +82,7 @@
throws DeviceNotAvailableException {
remountSystemRW();
mDevice.waitForDeviceAvailable();
- String cmd = String.format("rm /system/app/%s", systemApp);
+ String cmd = String.format("rm %s", systemApp);
mDevice.executeShellCommand(cmd);
if (reboot) {
mDevice.reboot();
diff --git a/prod-tests/src/com/android/framework/tests/PackageManagerOTATests.java b/prod-tests/src/com/android/framework/tests/PackageManagerOTATests.java
index 1c544ea..0cbc380 100644
--- a/prod-tests/src/com/android/framework/tests/PackageManagerOTATests.java
+++ b/prod-tests/src/com/android/framework/tests/PackageManagerOTATests.java
@@ -53,8 +53,6 @@
private static final String VERSION_1_APK = "FrameworkCoreTests_version_1.apk";
private static final String VERSION_2_APK = "FrameworkCoreTests_version_2.apk";
private static final String VERSION_3_APK = "FrameworkCoreTests_version_3.apk";
- private static final String SYSTEM_APK = "version_test.apk";
- private static final String SYSTEM_DIFF_APK = "version_test_diff.apk";
private static final String DATA_APP_DIRECTORY = "/data/app/";
private static final String PACKAGE_NAME = "com.android.frameworks.coretests.version_test";
private static final String VIBRATE_PERMISSION = "android.permission.VIBRATE";
@@ -68,9 +66,14 @@
super.setUp();
mUtils = new PackageManagerOTATestUtils(getDevice());
+ if (mUsePrivAppDirectory) {
+ mSystemAppPath = "/system/priv-app/version_test.apk";
+ mDiffSystemAppPath = "/system/priv-app/version_test_diff.apk";
+ }
+
// Clean up any potential old files from previous tests.
- mUtils.removeSystemApp(SYSTEM_DIFF_APK, false);
- mUtils.removeAndWipe(SYSTEM_APK);
+ mUtils.removeSystemApp(mDiffSystemAppPath, false);
+ mUtils.removeAndWipe(mSystemAppPath);
getDevice().waitForDeviceAvailable();
mPackageXml = mUtils.pullPackagesXML();
assertNotNull("Failed to pull packages xml file from device", mPackageXml);
@@ -78,11 +81,6 @@
mUtils.expectExists(mPackageXml, PACKAGE_XPATH));
assertFalse("Updated-package should not be present before test",
mUtils.expectExists(mPackageXml, UPDATE_PACKAGE_XPATH));
-
- if (mUsePrivAppDirectory) {
- mSystemAppPath = "/system/priv-app/version_test.apk";
- mDiffSystemAppPath = "/system/priv-app/version_test_diff.apk";
- }
}
@Override
@@ -209,7 +207,7 @@
assertTrue("Package should have FLAG_SYSTEM", expectFlag(mPackageXml, FLAG_XPATH, 1));
assertFalse("Updated-package should not be present",
mUtils.expectExists(mPackageXml, UPDATE_PACKAGE_XPATH));
- mUtils.removeSystemApp(SYSTEM_APK, true);
+ mUtils.removeSystemApp(mSystemAppPath, true);
mPackageXml = mUtils.pullPackagesXML();
assertFalse("Package should not be installed",
mUtils.expectExists(mPackageXml, PACKAGE_XPATH));
@@ -308,7 +306,7 @@
mUtils.installFile(getTestAppFilePath(VERSION_1_APK), true, "-d");
mPackageXml = mUtils.pullPackagesXML();
assertTrue("After system app upgrade, the path should be the upgraded app on /data",
- mUtils.expectStartsWith(mPackageXml, CODE_PATH_XPATH,
+ mUtils.expectStartsWith(mPackageXml, CODE_PATH_XPATH,
DATA_APP_DIRECTORY + PACKAGE_NAME));
assertTrue("Package version should be 1",
mUtils.expectEquals(mPackageXml, VERSION_XPATH, "1"));
@@ -452,7 +450,7 @@
assertTrue("ACCESS_CACHE_FILESYSTEM permission should be granted",
mUtils.packageHasPermission(PACKAGE_NAME, CACHE_PERMISSION));
- mUtils.removeSystemApp(SYSTEM_APK, false);
+ mUtils.removeSystemApp(mSystemAppPath, false);
mUtils.pushSystemApp(getTestAppFilePath(VERSION_2_APK), mDiffSystemAppPath);
mPackageXml = mUtils.pullPackagesXML();
@@ -490,7 +488,7 @@
assertTrue("ACCESS_CACHE_FILESYSTEM permission should be granted",
mUtils.packageHasPermission(PACKAGE_NAME, CACHE_PERMISSION));
- mUtils.removeSystemApp(SYSTEM_APK, true);
+ mUtils.removeSystemApp(mSystemAppPath, true);
mPackageXml = mUtils.pullPackagesXML();
assertTrue("Package should still be installed",
mUtils.expectExists(mPackageXml, PACKAGE_XPATH));
diff --git a/src/com/android/tradefed/util/AaptParser.java b/src/com/android/tradefed/util/AaptParser.java
index 7940dd3..c00d4f1 100644
--- a/src/com/android/tradefed/util/AaptParser.java
+++ b/src/com/android/tradefed/util/AaptParser.java
@@ -46,6 +46,7 @@
mVersionName = m.group(3);
} else {
CLog.e("Failed to parse package and version info from 'aapt dump badging'");
+ CLog.e(aaptOut);
}
}
diff --git a/src/com/android/tradefed/util/net/HttpHelper.java b/src/com/android/tradefed/util/net/HttpHelper.java
index 3501fb1..f7098ee 100644
--- a/src/com/android/tradefed/util/net/HttpHelper.java
+++ b/src/com/android/tradefed/util/net/HttpHelper.java
@@ -411,6 +411,7 @@
if (redirect) {
String location = conn.getHeaderField("Location");
URL newURL = new URL(location);
+ CLog.d("Redirect occured during GET, new url %s", location);
conn = createConnection(newURL, "GET", null);
}
} while(redirect && redirectCount < mMaxRedirects);