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

Merge changes I1cae6530,I7ffaa260

Browse source 
* changes:
  Publish chunk size in utility.h
  Remove magic numbers from test and use storage literals
This commit is contained in:
Treehugger Robot 2019-10-15 04:55:19 +00:00 committed by Gerrit Code Review
commit e34d239023
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
fs_mgr/libsnapshot/partition_cow_creator_test.cpp
View file

@ -32,17 +32,20 @@ class PartitionCowCreatorTest : public ::testing::Test {
};
TEST_F(PartitionCowCreatorTest, IntersectSelf) {
auto builder_a = MetadataBuilder::New(1024 * 1024, 1024, 2);
constexpr uint64_t initial_size = 1_MiB;
constexpr uint64_t final_size = 40_KiB;
auto builder_a = MetadataBuilder::New(initial_size, 1_KiB, 2);
ASSERT_NE(builder_a, nullptr);
auto system_a = builder_a->AddPartition("system_a", LP_PARTITION_ATTR_READONLY);
ASSERT_NE(system_a, nullptr);
ASSERT_TRUE(builder_a->ResizePartition(system_a, 40 * 1024));
ASSERT_TRUE(builder_a->ResizePartition(system_a, final_size));
auto builder_b = MetadataBuilder::New(1024 * 1024, 1024, 2);
auto builder_b = MetadataBuilder::New(initial_size, 1_KiB, 2);
ASSERT_NE(builder_b, nullptr);
auto system_b = builder_b->AddPartition("system_b", LP_PARTITION_ATTR_READONLY);
ASSERT_NE(system_b, nullptr);
ASSERT_TRUE(builder_b->ResizePartition(system_b, 40 * 1024));
ASSERT_TRUE(builder_b->ResizePartition(system_b, final_size));
PartitionCowCreator creator{.target_metadata = builder_b.get(),
.target_suffix = "_b",
@ -51,8 +54,8 @@ TEST_F(PartitionCowCreatorTest, IntersectSelf) {
.current_suffix = "_a"};
auto ret = creator.Run();
ASSERT_TRUE(ret.has_value());
ASSERT_EQ(40 * 1024, ret->snapshot_status.device_size());
ASSERT_EQ(40 * 1024, ret->snapshot_status.snapshot_size());
ASSERT_EQ(final_size, ret->snapshot_status.device_size());
ASSERT_EQ(final_size, ret->snapshot_status.snapshot_size());
}
TEST_F(PartitionCowCreatorTest, Holes) {
@ -64,7 +67,7 @@ TEST_F(PartitionCowCreatorTest, Holes) {
BlockDeviceInfo super_device("super", kSuperSize, 0, 0, 4_KiB);
std::vector<BlockDeviceInfo> devices = {super_device};
auto source = MetadataBuilder::New(devices, "super", 1024, 2);
auto source = MetadataBuilder::New(devices, "super", 1_KiB, 2);
auto system = source->AddPartition("system_a", 0);
ASSERT_NE(nullptr, system);
ASSERT_TRUE(source->ResizePartition(system, big_size));

2
fs_mgr/libsnapshot/snapshot.cpp
View file

@ -71,8 +71,6 @@ using std::chrono::duration_cast;
using namespace std::chrono_literals;
using namespace std::string_literals;
// Unit is sectors, this is a 4K chunk.
static constexpr uint32_t kSnapshotChunkSize = 8;
static constexpr char kBootIndicatorPath[] = "/metadata/ota/snapshot-boot";
class DeviceInfo final : public SnapshotManager::IDeviceInfo {

3
fs_mgr/libsnapshot/utility.h
View file

@ -27,6 +27,9 @@
namespace android {
namespace snapshot {
// Unit is sectors, this is a 4K chunk.
static constexpr uint32_t kSnapshotChunkSize = 8;
struct AutoDevice {
virtual ~AutoDevice(){};
void Release();