diff options
| author | Andrew Scull <ascull@google.com> | 2018-05-23 10:35:54 +0000 |
|---|---|---|
| committer | Andrew Scull <ascull@google.com> | 2018-05-23 10:35:54 +0000 |
| commit | 65451da67d41659e1ccc76dd0a8d5ee5d53644a0 (patch) | |
| tree | f0938841ff2734c31961d989f430c4ce01acb256 /src/avb_tests.cc | |
| parent | 8681d82e3b25f5ad8c999a1344112c411bcb52bc (diff) | |
| download | system-test-harness-65451da67d41659e1ccc76dd0a8d5ee5d53644a0.tar.gz | |
Revert "Merge remote-tracking branch 'goog/upstream-master' into merge-citadel-pre-1.0.0"
This reverts commit 8681d82e3b25f5ad8c999a1344112c411bcb52bc.
Reason for revert: Update is breaking PINs
Bug: 80131663
Change-Id: I4a5607babef8d1a5a612859aeb14f417ba58ce8e
Diffstat (limited to 'src/avb_tests.cc')
| -rw-r--r-- | src/avb_tests.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/avb_tests.cc b/src/avb_tests.cc index 14aa01c..3cc22f5 100644 --- a/src/avb_tests.cc +++ b/src/avb_tests.cc @@ -433,7 +433,6 @@ TEST_F(AvbTest, DeviceLockTest) // Test can set lock ResetProduction(client.get()); - SetBootloader(); code = SetDeviceLock(0x34); ASSERT_NO_ERROR(code, ""); @@ -458,11 +457,6 @@ TEST_F(AvbTest, DeviceLockTest) ASSERT_EQ(locks[DEVICE], 0x00); } -TEST_F(AvbTest, SetDeviceLockIsIdempotent) { - ASSERT_NO_ERROR(SetDeviceLock(0x65), ""); - ASSERT_NO_ERROR(SetDeviceLock(0x65), ""); -} - TEST_F(AvbTest, BootLockTest) { uint8_t locks[4]; @@ -504,7 +498,6 @@ TEST_F(AvbTest, BootLockTest) ASSERT_NO_ERROR(code, ""); // Can lock when carrier lock is set. - SetBootloader(); code = SetBootLock(0x56); ASSERT_NO_ERROR(code, ""); @@ -526,7 +519,6 @@ TEST_F(AvbTest, BootLockTest) ASSERT_NO_ERROR(code, ""); code = SetProduction(client.get(), true, NULL, 0); ASSERT_NO_ERROR(code, ""); - SetBootloader(); // Need to be in the HLOS. code = SetDeviceLock(0x78); @@ -551,11 +543,6 @@ TEST_F(AvbTest, BootLockTest) ASSERT_EQ(locks[BOOT], 0x9A); } -TEST_F(AvbTest, SetBootLockIsIdempotent) { - ASSERT_NO_ERROR(SetBootLock(0x12), ""); - ASSERT_NO_ERROR(SetBootLock(0x12), ""); -} - TEST_F(AvbTest, OwnerLockTest) { uint8_t owner_key[AVB_METADATA_MAX_SIZE]; |