StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "releasetools: Fix a broken test due to verity utils relocation."

Browse Source
This commit is contained in:
Tao Bao
2018-10-14 14:58:57 +00:00
committed by Gerrit Code Review
parent d685239e37 28f201b417
commit 1e5a23f9b0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/test_validate_target_files.py
View File

@@ -20,9 +20,9 @@ import os
import os.path import os.path
import shutil import shutil
import build_image
import common import common
import test_utils import test_utils
import verity_utils
from validate_target_files import ValidateVerifiedBootImages from validate_target_files import ValidateVerifiedBootImages
@@ -109,7 +109,7 @@ class ValidateTargetFilesTest(test_utils.ReleaseToolsTestCase):
def _generate_system_image(self, output_file): def _generate_system_image(self, output_file):
verity_fec = True verity_fec = True
partition_size = 1024 * 1024 partition_size = 1024 * 1024
image_size, verity_size = build_image.AdjustPartitionSizeForVerity( image_size, verity_size = verity_utils.AdjustPartitionSizeForVerity(
partition_size, verity_fec) partition_size, verity_fec)
# Use an empty root directory. # Use an empty root directory.
@@ -132,7 +132,7 @@ class ValidateTargetFilesTest(test_utils.ReleaseToolsTestCase):
'verity_signer_cmd' : 'verity_signer', 'verity_signer_cmd' : 'verity_signer',
'verity_size' : str(verity_size), 'verity_size' : str(verity_size),
} }
build_image.MakeVerityEnabledImage(output_file, verity_fec, prop_dict) verity_utils.MakeVerityEnabledImage(output_file, verity_fec, prop_dict)
def test_ValidateVerifiedBootImages_systemImage(self): def test_ValidateVerifiedBootImages_systemImage(self):
input_tmp = common.MakeTempDir() input_tmp = common.MakeTempDir()