commit ec47dc37b8b717fd3021fc53ddf8f70a6038a93b
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 12 22:30:39 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 12 22:30:39 2021 +0000
tree 7be566def0e1ccb9d379fbab776fbda6f94e4c80
parent 020d24a2db249fff728464c1b755e126e60e2e11
parent a88a07d8b95611e703be1704150dbd9a3052e7f2

Merge "Disable failed imgpatch tests" am: 043ef5ff40 am: 8775469f76 am: a88a07d8b9

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1545084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b0bded4cdc31ada758dafc0318a0a9f4fc7ebf8

tests/unit/applypatch_modes_test.cpp

diff --git a/tests/unit/applypatch_modes_test.cpp b/tests/unit/applypatch_modes_test.cpp
index 08414b7..9e97979 100644
--- a/tests/unit/applypatch_modes_test.cpp
+++ b/tests/unit/applypatch_modes_test.cpp
@@ -100,7 +100,7 @@
   ASSERT_EQ(2, InvokeApplyPatchModes({ "applypatch", "-x" }));
 }
 
-TEST_F(ApplyPatchModesTest, PatchModeEmmcTarget) {
+TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTarget) {
   std::vector<std::string> args{
     "applypatch",
     "--bonus",
@@ -118,7 +118,7 @@
 
 // Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has
 // everything).
-TEST_F(ApplyPatchModesTest, PatchModeEmmcTargetWithoutBonusFile) {
+TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTargetWithoutBonusFile) {
   std::vector<std::string> args{
     "applypatch", "--patch", from_testdata_base("recovery-from-boot-with-bonus.p"),
     "--target",   target,    "--source",

tests/unit/applypatch_test.cpp

diff --git a/tests/unit/applypatch_test.cpp b/tests/unit/applypatch_test.cpp
index 218a224..4b80dce 100644
--- a/tests/unit/applypatch_test.cpp
+++ b/tests/unit/applypatch_test.cpp
@@ -132,7 +132,7 @@
       PatchPartitionCheck(target_partition, Partition(target_file, source_size, source_sha1)));
 }
 
-TEST_F(ApplyPatchTest, PatchPartition) {
+TEST_F(ApplyPatchTest, DISABLED_PatchPartition) {
   FileContents patch_fc;
   ASSERT_TRUE(LoadFileContents(from_testdata_base("recovery-from-boot.p"), &patch_fc));
   Value patch(Value::Type::BLOB, std::string(patch_fc.data.cbegin(), patch_fc.data.cend()));
@@ -146,7 +146,7 @@
 
 // Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has
 // everything).
-TEST_F(ApplyPatchTest, PatchPartitionWithoutBonusFile) {
+TEST_F(ApplyPatchTest, DISABLED_PatchPartitionWithoutBonusFile) {
   FileContents patch_fc;
   ASSERT_TRUE(LoadFileContents(from_testdata_base("recovery-from-boot-with-bonus.p"), &patch_fc));
   Value patch(Value::Type::BLOB, std::string(patch_fc.data.cbegin(), patch_fc.data.cend()));