diff options
| author | Amin Hassani <ahassani@google.com> | 2018-02-07 16:21:33 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-02-08 23:41:46 -0800 |
| commit | 77d7cbcef1ca1afd36720ec7ec74039b5445101e (patch) | |
| tree | 6305cce22e391284bc5b06bce00928ba7fb8d69d /scripts/update_payload/checker_unittest.py | |
| parent | 15de2fd0ff2d19a7ef36a0f28bb5df028163605c (diff) | |
update_engine: Disable puffin in minor version 4
This patch disables puffin for minor version 4, but keeps BROTLI_BSDIFF in the
same minor version. Also adds puffin for minor version 5, but it does not
enable it.
BUG=b:72815313
BUG=chromium:810184
TEST=update_engine unittests pass
TEST=update_payload unittests pass
TEST=test_paycheck.sh on two images with minor version 4 pass
TEST=brill_update_payload generate/verify pass
Change-Id: I814fc126d67207501d419cff9c575cd13d877b48
Reviewed-on: https://chromium-review.googlesource.com/907223
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Diffstat (limited to 'scripts/update_payload/checker_unittest.py')
| -rwxr-xr-x | scripts/update_payload/checker_unittest.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/update_payload/checker_unittest.py b/scripts/update_payload/checker_unittest.py index 394ed0bd..f7182342 100755 --- a/scripts/update_payload/checker_unittest.py +++ b/scripts/update_payload/checker_unittest.py @@ -897,8 +897,10 @@ class PayloadCheckerTest(mox.MoxTestBase): if op_type == common.OpType.REPLACE_XZ: payload_checker.minor_version = 2 if fail_bad_minor_version else 3 elif op_type in (common.OpType.ZERO, common.OpType.DISCARD, - common.OpType.PUFFDIFF, common.OpType.BROTLI_BSDIFF): + common.OpType.BROTLI_BSDIFF): payload_checker.minor_version = 3 if fail_bad_minor_version else 4 + elif op_type == common.OpType.PUFFDIFF: + payload_checker.minor_version = 4 if fail_bad_minor_version else 5 if op_type not in (common.OpType.MOVE, common.OpType.SOURCE_COPY): if not fail_mismatched_data_offset_length: @@ -1113,7 +1115,8 @@ class PayloadCheckerTest(mox.MoxTestBase): (minor_version == 1 and payload_type == checker._TYPE_DELTA) or (minor_version == 2 and payload_type == checker._TYPE_DELTA) or (minor_version == 3 and payload_type == checker._TYPE_DELTA) or - (minor_version == 4 and payload_type == checker._TYPE_DELTA)) + (minor_version == 4 and payload_type == checker._TYPE_DELTA) or + (minor_version == 5 and payload_type == checker._TYPE_DELTA)) args = (report,) if should_succeed: @@ -1340,7 +1343,7 @@ def AddAllParametricTests(): # Add all _CheckManifestMinorVersion() test cases. AddParametricTests('CheckManifestMinorVersion', - {'minor_version': (None, 0, 1, 2, 3, 4, 555), + {'minor_version': (None, 0, 1, 2, 3, 4, 5, 555), 'payload_type': (checker._TYPE_FULL, checker._TYPE_DELTA)}) |