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

Merge "Add libsnapshot_test to presubmit" am: a6bc86aae7 am: 666989df73

Browse source 
Change-Id: I35d059739332fa0490df96bf0b19a8c618363137
This commit is contained in:
Automerger Merge Worker 2020-02-06 17:21:24 +00:00
commit b0f83db827
3 changed files with 49 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs_mgr/TEST_MAPPING
View file

@ -11,6 +11,9 @@
},
{
"name": "fiemap_writer_test"
},
{
"name": "vts_libsnapshot_test_presubmit"
}
]
}

29
fs_mgr/libsnapshot/Android.bp
View file

@ -160,8 +160,8 @@ cc_library_static {
],
}
cc_test {
name: "libsnapshot_test",
cc_defaults {
name: "libsnapshot_test_defaults",
defaults: ["libsnapshot_defaults"],
srcs: [
"partition_cow_creator_test.cpp",
@ -173,10 +173,7 @@ cc_test {
"android.hardware.boot@1.1",
"libbinder",
"libcrypto",
"libfs_mgr",
"libgsi",
"libhidlbase",
"liblp",
"libprotobuf-cpp-lite",
"libsparse",
"libutils",
@ -186,16 +183,38 @@ cc_test {
"libutilscallstack",
],
static_libs: [
"libfs_mgr",
"libgsi",
"libgmock",
"liblp",
"libsnapshot",
"libsnapshot_test_helpers",
],
header_libs: [
"libstorage_literals_headers",
],
test_suites: [
"vts-core",
"device-tests"
],
test_min_api_level: 29,
auto_gen_config: true,
require_root: true,
}
cc_test {
name: "vts_libsnapshot_test",
defaults: ["libsnapshot_test_defaults"],
}
cc_test {
name: "vts_libsnapshot_test_presubmit",
defaults: ["libsnapshot_test_defaults"],
cppflags: [
"-DSKIP_TEST_IN_PRESUBMIT",
],
}
cc_binary {
name: "snapshotctl",
srcs: [

22
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -506,6 +506,9 @@ TEST_F(SnapshotTest, Merge) {
}
TEST_F(SnapshotTest, FirstStageMountAndMerge) {
#ifdef SKIP_TEST_IN_PRESUBMIT
GTEST_SKIP() << "WIP failure b/148889015";
#endif
ASSERT_TRUE(AcquireLock());
static const uint64_t kDeviceSize = 1024 * 1024;
@ -562,6 +565,9 @@ TEST_F(SnapshotTest, FlashSuperDuringUpdate) {
}
TEST_F(SnapshotTest, FlashSuperDuringMerge) {
#ifdef SKIP_TEST_IN_PRESUBMIT
GTEST_SKIP() << "WIP failure b/148889015";
#endif
ASSERT_TRUE(AcquireLock());
static const uint64_t kDeviceSize = 1024 * 1024;
@ -973,6 +979,9 @@ class SnapshotUpdateTest : public SnapshotTest {
// Also test UnmapUpdateSnapshot unmaps everything.
// Also test first stage mount and merge after this.
TEST_F(SnapshotUpdateTest, FullUpdateFlow) {
#ifdef SKIP_TEST_IN_PRESUBMIT
GTEST_SKIP() << "WIP failure b/148889015";
#endif
// OTA client blindly unmaps all partitions that are possibly mapped.
for (const auto& name : {"sys_b", "vnd_b", "prd_b"}) {
ASSERT_TRUE(sm->UnmapUpdateSnapshot(name));
@ -1120,6 +1129,9 @@ TEST_F(SnapshotUpdateTest, SnapshotStatusFileWithoutCow) {
// Test that the old partitions are not modified.
TEST_F(SnapshotUpdateTest, TestRollback) {
#ifdef SKIP_TEST_IN_PRESUBMIT
GTEST_SKIP() << "WIP failure b/148889015";
#endif
// Execute the update.
ASSERT_TRUE(sm->BeginUpdate());
ASSERT_TRUE(sm->UnmapUpdateSnapshot("sys_b"));
@ -1297,6 +1309,9 @@ TEST_F(SnapshotUpdateTest, RetrofitAfterRegularAb) {
}
TEST_F(SnapshotUpdateTest, MergeCannotRemoveCow) {
#ifdef SKIP_TEST_IN_PRESUBMIT
GTEST_SKIP() << "WIP failure b/148889015";
#endif
// Make source partitions as big as possible to force COW image to be created.
SetSize(sys_, 5_MiB);
SetSize(vnd_, 5_MiB);
@ -1571,6 +1586,9 @@ TEST_F(SnapshotUpdateTest, Overflow) {
}
TEST_F(SnapshotUpdateTest, WaitForMerge) {
#ifdef SKIP_TEST_IN_PRESUBMIT
GTEST_SKIP() << "WIP failure b/148889015";
#endif
AddOperationForPartitions();
// Execute the update.
@ -1790,6 +1808,10 @@ std::vector<uint64_t> ImageManagerTestParams() {
std::vector<uint64_t> ret;
for (uint64_t size = 1_MiB; size <= 512_MiB; size *= 2) {
ret.push_back(size);
#ifdef SKIP_TEST_IN_PRESUBMIT
// BUG(148889015);
break;
#endif
}
return ret;
}