summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-01-12 23:30:39 +0100
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-12 23:30:39 +0100
commitec47dc37b8b717fd3021fc53ddf8f70a6038a93b (patch)
tree7be566def0e1ccb9d379fbab776fbda6f94e4c80
parent[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6246c37677 -s ours am: 049745c912 -s ours (diff)
parentMerge "Disable failed imgpatch tests" am: 043ef5ff40 am: 8775469f76 (diff)
downloadandroid_bootable_recovery-ec47dc37b8b717fd3021fc53ddf8f70a6038a93b.tar
android_bootable_recovery-ec47dc37b8b717fd3021fc53ddf8f70a6038a93b.tar.gz
android_bootable_recovery-ec47dc37b8b717fd3021fc53ddf8f70a6038a93b.tar.bz2
android_bootable_recovery-ec47dc37b8b717fd3021fc53ddf8f70a6038a93b.tar.lz
android_bootable_recovery-ec47dc37b8b717fd3021fc53ddf8f70a6038a93b.tar.xz
android_bootable_recovery-ec47dc37b8b717fd3021fc53ddf8f70a6038a93b.tar.zst
android_bootable_recovery-ec47dc37b8b717fd3021fc53ddf8f70a6038a93b.zip
-rw-r--r--tests/unit/applypatch_modes_test.cpp4
-rw-r--r--tests/unit/applypatch_test.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/unit/applypatch_modes_test.cpp b/tests/unit/applypatch_modes_test.cpp
index 08414b796..9e9797950 100644
--- a/tests/unit/applypatch_modes_test.cpp
+++ b/tests/unit/applypatch_modes_test.cpp
@@ -100,7 +100,7 @@ TEST_F(ApplyPatchModesTest, InvalidArgs) {
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 @@ TEST_F(ApplyPatchModesTest, PatchModeEmmcTarget) {
// 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",
diff --git a/tests/unit/applypatch_test.cpp b/tests/unit/applypatch_test.cpp
index 218a224f8..4b80dcee9 100644
--- a/tests/unit/applypatch_test.cpp
+++ b/tests/unit/applypatch_test.cpp
@@ -132,7 +132,7 @@ TEST_F(ApplyPatchTest, PatchPartitionCheck_UseBackup_BothCorrupted) {
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 @@ TEST_F(ApplyPatchTest, PatchPartition) {
// 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()));