summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-02-25 04:44:29 +0100
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-02-25 04:44:29 +0100
commit8fbe9740ae37ce949503fd970bab1c702bef5d20 (patch)
tree4594269aab2d40edfd12b9857a2e7330fd8bbcf0
parentMerge "Add timed out test files to tidy_timeout_srcs" am: a9a8f091cb am: f92f815f9c am: af2219f20e am: b9439bc55f am: f7eab47eeb (diff)
parentMerge "Disable flaky recovery test" am: 3ca4bf9b8c am: 5188d3c59d am: e1abfc8476 am: 9ba6df09f1 (diff)
downloadandroid_bootable_recovery-8fbe9740ae37ce949503fd970bab1c702bef5d20.tar
android_bootable_recovery-8fbe9740ae37ce949503fd970bab1c702bef5d20.tar.gz
android_bootable_recovery-8fbe9740ae37ce949503fd970bab1c702bef5d20.tar.bz2
android_bootable_recovery-8fbe9740ae37ce949503fd970bab1c702bef5d20.tar.lz
android_bootable_recovery-8fbe9740ae37ce949503fd970bab1c702bef5d20.tar.xz
android_bootable_recovery-8fbe9740ae37ce949503fd970bab1c702bef5d20.tar.zst
android_bootable_recovery-8fbe9740ae37ce949503fd970bab1c702bef5d20.zip
-rw-r--r--tests/unit/host/update_simulator_test.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/unit/host/update_simulator_test.cpp b/tests/unit/host/update_simulator_test.cpp
index fb1217877..1603982e4 100644
--- a/tests/unit/host/update_simulator_test.cpp
+++ b/tests/unit/host/update_simulator_test.cpp
@@ -101,7 +101,7 @@ static void RunSimulation(std::string_view src_tf, std::string_view ota_package,
// TODO(xunchang) check the recovery&system has the expected contents.
}
-class UpdateSimulatorTest : public ::testing::Test {
+class DISABLED_UpdateSimulatorTest : public ::testing::Test {
protected:
void SetUp() override {
std::vector<string> props = {
@@ -147,7 +147,7 @@ class UpdateSimulatorTest : public ::testing::Test {
string sparse_system_string_;
};
-TEST_F(UpdateSimulatorTest, TargetFile_ExtractImage) {
+TEST_F(DISABLED_UpdateSimulatorTest, TargetFile_ExtractImage) {
TemporaryFile zip_file;
AddZipEntries(zip_file.release(), { { "META/misc_info.txt", "extfs_sparse_flag=-s" },
{ "IMAGES/system.img", sparse_system_string_ } });
@@ -166,7 +166,7 @@ TEST_F(UpdateSimulatorTest, TargetFile_ExtractImage) {
ASSERT_EQ(expected_content, content);
}
-TEST_F(UpdateSimulatorTest, TargetFile_ParseFstabInfo) {
+TEST_F(DISABLED_UpdateSimulatorTest, TargetFile_ParseFstabInfo) {
TemporaryFile zip_file;
AddZipEntries(zip_file.release(),
{ { "META/misc_info.txt", "" },
@@ -195,7 +195,7 @@ TEST_F(UpdateSimulatorTest, TargetFile_ParseFstabInfo) {
EXPECT_EQ(expected, transformed);
}
-TEST_F(UpdateSimulatorTest, BuildInfo_ParseTargetFile) {
+TEST_F(DISABLED_UpdateSimulatorTest, BuildInfo_ParseTargetFile) {
std::map<string, string> entries = {
{ "META/misc_info.txt", "" },
{ "SYSTEM/build.prop", build_prop_string_ },
@@ -240,7 +240,7 @@ TEST_F(UpdateSimulatorTest, BuildInfo_ParseTargetFile) {
}
}
-TEST_F(UpdateSimulatorTest, RunUpdateSmoke) {
+TEST_F(DISABLED_UpdateSimulatorTest, RunUpdateSmoke) {
string recovery_img_string = "recovery.img";
string boot_img_string = "boot.img";
@@ -326,7 +326,7 @@ TEST_F(UpdateSimulatorTest, RunUpdateSmoke) {
RunSimulation(src_tf.path, ota_package.path, true);
}
-TEST_F(UpdateSimulatorTest, RunUpdateUnrecognizedFunction) {
+TEST_F(DISABLED_UpdateSimulatorTest, RunUpdateUnrecognizedFunction) {
std::map<string, string> src_entries{
{ "META/misc_info.txt", "extfs_sparse_flag=-s" },
{ "IMAGES/system.img", sparse_system_string_ },
@@ -350,7 +350,7 @@ TEST_F(UpdateSimulatorTest, RunUpdateUnrecognizedFunction) {
RunSimulation(src_tf.path, ota_package.path, false);
}
-TEST_F(UpdateSimulatorTest, RunUpdateApplyPatchFailed) {
+TEST_F(DISABLED_UpdateSimulatorTest, RunUpdateApplyPatchFailed) {
string recovery_img_string = "recovery.img";
string boot_img_string = "boot.img";