Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[incremental] storage is regarded as fully loaded if there's no file or only empty files

Browse Source 
Test: atest service.incremental_test
BUG: 165799231
Change-Id: I3b6be3918d53ce4ab0a30a4da493d9730a31ed3c
This commit is contained in:
Songchun Fan
2020-08-25 13:12:16 -07:00
parent d6de4dcbd4
commit 425862f3e7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/incremental/IncrementalService.cpp
View File

@@ -1706,8 +1706,8 @@ float IncrementalService::getLoadingProgressFromPath(const IncFsMount& ifs,
}
if (totalBlocks == 0) {
LOG(ERROR) << "getLoadingProgress failed to get total num of blocks";
return -EINVAL;
// No file in the storage or files are empty; regarded as fully loaded
return 1;
}
return (float)filledBlocks / (float)totalBlocks;
}

8
services/incremental/test/IncrementalServiceTest.cpp
View File

@@ -1069,7 +1069,7 @@ TEST_F(IncrementalServiceTest, testMakeDirectories) {
ASSERT_EQ(res, 0);
}
TEST_F(IncrementalServiceTest, testGetLoadingProgressFailsWithNoFile) {
TEST_F(IncrementalServiceTest, testGetLoadingProgressSuccessWithNoFile) {
mIncFs->countFilledBlocksSuccess();
mFs->hasNoFile();
@@ -1077,7 +1077,7 @@ TEST_F(IncrementalServiceTest, testGetLoadingProgressFailsWithNoFile) {
int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
IncrementalService::CreateOptions::CreateNew,
{}, {}, {});
ASSERT_EQ(-EINVAL, mIncrementalService->getLoadingProgress(storageId));
ASSERT_EQ(1, mIncrementalService->getLoadingProgress(storageId));
}
TEST_F(IncrementalServiceTest, testGetLoadingProgressFailsWithFailedRanges) {
@@ -1092,7 +1092,7 @@ TEST_F(IncrementalServiceTest, testGetLoadingProgressFailsWithFailedRanges) {
ASSERT_EQ(-1, mIncrementalService->getLoadingProgress(storageId));
}
TEST_F(IncrementalServiceTest, testGetLoadingProgressFailsWithEmptyRanges) {
TEST_F(IncrementalServiceTest, testGetLoadingProgressSuccessWithEmptyRanges) {
mIncFs->countFilledBlocksEmpty();
mFs->hasFiles();
@@ -1101,7 +1101,7 @@ TEST_F(IncrementalServiceTest, testGetLoadingProgressFailsWithEmptyRanges) {
IncrementalService::CreateOptions::CreateNew,
{}, {}, {});
EXPECT_CALL(*mIncFs, countFilledBlocks(_, _)).Times(3);
ASSERT_EQ(-EINVAL, mIncrementalService->getLoadingProgress(storageId));
ASSERT_EQ(1, mIncrementalService->getLoadingProgress(storageId));
}
TEST_F(IncrementalServiceTest, testGetLoadingProgressSuccess) {