tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Re-enable failed imgpatch tests

Browse source 
Now we added a libz variant without the offending optimizations,
    re-enable tests.

Test: treehugger
Bug: 177076632
Change-Id: I6969090b2cb4c059d952df7cc034d0ed1ac366b2
This commit is contained in:
Kelvin Zhang 2021-01-12 16:48:12 -05:00
parent 2f2749f213
commit 07ba4483a6
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
tests/testdata/recovery-from-boot.p vendored
View file

Binary file not shown.

4
tests/unit/applypatch_modes_test.cpp
View file

@ -100,7 +100,7 @@ TEST_F(ApplyPatchModesTest, InvalidArgs) {
ASSERT_EQ(2, InvokeApplyPatchModes({ "applypatch", "-x" })); ASSERT_EQ(2, InvokeApplyPatchModes({ "applypatch", "-x" }));
} }
TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTarget) { TEST_F(ApplyPatchModesTest, PatchModeEmmcTarget) {
std::vector<std::string> args{ std::vector<std::string> args{
"applypatch", "applypatch",
"--bonus", "--bonus",
@ -118,7 +118,7 @@ TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTarget) {
// Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has // Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has
// everything). // everything).
TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTargetWithoutBonusFile) { TEST_F(ApplyPatchModesTest, PatchModeEmmcTargetWithoutBonusFile) {
std::vector<std::string> args{ std::vector<std::string> args{
"applypatch", "--patch", from_testdata_base("recovery-from-boot-with-bonus.p"), "applypatch", "--patch", from_testdata_base("recovery-from-boot-with-bonus.p"),
"--target", target, "--source", "--target", target, "--source",

4
tests/unit/applypatch_test.cpp
View file

@ -132,7 +132,7 @@ TEST_F(ApplyPatchTest, PatchPartitionCheck_UseBackup_BothCorrupted) {
PatchPartitionCheck(target_partition, Partition(target_file, source_size, source_sha1))); PatchPartitionCheck(target_partition, Partition(target_file, source_size, source_sha1)));
} }
TEST_F(ApplyPatchTest, DISABLED_PatchPartition) { TEST_F(ApplyPatchTest, PatchPartition) {
FileContents patch_fc; FileContents patch_fc;
ASSERT_TRUE(LoadFileContents(from_testdata_base("recovery-from-boot.p"), &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())); Value patch(Value::Type::BLOB, std::string(patch_fc.data.cbegin(), patch_fc.data.cend()));
@ -146,7 +146,7 @@ TEST_F(ApplyPatchTest, DISABLED_PatchPartition) {
// Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has // Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has
// everything). // everything).
TEST_F(ApplyPatchTest, DISABLED_PatchPartitionWithoutBonusFile) { TEST_F(ApplyPatchTest, PatchPartitionWithoutBonusFile) {
FileContents patch_fc; FileContents patch_fc;
ASSERT_TRUE(LoadFileContents(from_testdata_base("recovery-from-boot-with-bonus.p"), &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())); Value patch(Value::Type::BLOB, std::string(patch_fc.data.cbegin(), patch_fc.data.cend()));