summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamiul Islam <samiul@google.com>2022-04-22 20:19:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-22 20:19:33 +0000
commitcaa8024125da52766efdf235d8adf27313db84e5 (patch)
tree03156d61737987b62ee4fa18de23bb2a21661364
parent57b67306a7e6abb4b248205d07d037da9d3ddee8 (diff)
parenta321f233fb2242e68bb29f5bdd8a85baa67c46fa (diff)
downloadapex-caa8024125da52766efdf235d8adf27313db84e5.tar.gz
Disable broken tests am: a321f233fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/apex/+/17914283 Change-Id: Idd2ae62cd042f4db2754624fe28a294375d3d4cb Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--apexd/apex_file_test.cpp2
-rw-r--r--apexd/apexd_test.cpp4
-rw-r--r--apexd/apexservice_test.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/apexd/apex_file_test.cpp b/apexd/apex_file_test.cpp
index d6d9cf2c..a9d83a2b 100644
--- a/apexd/apex_file_test.cpp
+++ b/apexd/apex_file_test.cpp
@@ -241,7 +241,7 @@ TEST(ApexFileTest, CannotVerifyApexVerityForCompressedApex) {
::testing::HasSubstr("Cannot verify ApexVerity of compressed APEX"));
}
-TEST(ApexFileTest, DecompressCompressedApex) {
+TEST(ApexFileTest, DISABLED_DecompressCompressedApex) {
const std::string file_path =
kTestDataDir + "com.android.apex.compressed.v1.capex";
Result<ApexFile> apex_file = ApexFile::Open(file_path);
diff --git a/apexd/apexd_test.cpp b/apexd/apexd_test.cpp
index 327ceaff..6e248a58 100644
--- a/apexd/apexd_test.cpp
+++ b/apexd/apexd_test.cpp
@@ -414,7 +414,7 @@ TEST_F(ApexdUnitTest, SharedLibsDataVersionDeletedIfLower) {
ASSERT_THAT(result, UnorderedElementsAre(ApexFileEq(ByRef(*shared_lib_v2))));
}
-TEST_F(ApexdUnitTest, ProcessCompressedApex) {
+TEST_F(ApexdUnitTest, DISABLED_ProcessCompressedApex) {
auto compressed_apex = ApexFile::Open(
AddPreInstalledApex("com.android.apex.compressed.v1.capex"));
@@ -529,7 +529,7 @@ TEST_F(ApexdUnitTest, ProcessCompressedApexCanBeCalledMultipleTimes) {
}
// Test behavior of ProcessCompressedApex when is_ota_chroot is true
-TEST_F(ApexdUnitTest, ProcessCompressedApexOnOtaChroot) {
+TEST_F(ApexdUnitTest, DISABLED_ProcessCompressedApexOnOtaChroot) {
auto compressed_apex = ApexFile::Open(
AddPreInstalledApex("com.android.apex.compressed.v1.capex"));
diff --git a/apexd/apexservice_test.cpp b/apexd/apexservice_test.cpp
index 18918fb3..29cf1d73 100644
--- a/apexd/apexservice_test.cpp
+++ b/apexd/apexservice_test.cpp
@@ -769,7 +769,7 @@ TEST_F(ApexServiceTest, GetFactoryPackages) {
}
}
-TEST_F(ApexServiceTest, NoPackagesAreBothActiveAndInactive) {
+TEST_F(ApexServiceTest, DISABLED_NoPackagesAreBothActiveAndInactive) {
Result<std::vector<ApexInfo>> active_packages = GetActivePackages();
ASSERT_TRUE(IsOk(active_packages));
ASSERT_TRUE(active_packages->size() > 0);
@@ -789,7 +789,7 @@ TEST_F(ApexServiceTest, NoPackagesAreBothActiveAndInactive) {
ASSERT_THAT(intersection, SizeIs(0));
}
-TEST_F(ApexServiceTest, GetAllPackages) {
+TEST_F(ApexServiceTest, DISABLED_GetAllPackages) {
Result<std::vector<ApexInfo>> all_packages = GetAllPackages();
ASSERT_TRUE(IsOk(all_packages));
ASSERT_TRUE(all_packages->size() > 0);