Skip to content

Commit

Permalink
crypto: ccp - Fix some unfused tests
Browse files Browse the repository at this point in the history
Some of the tests for unfused parts referenced a named member parameter,
but when the test suite was switched to call a python ctypes library they
weren't updated.  Adjust them to refer to the first argument of the
process_param() call and set the data type of the signature appropriately.

Fixes: 15f8aa7 ("crypto: ccp - Add unit tests for dynamic boost control")
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Mario Limonciello authored and Herbert Xu committed Sep 15, 2023
1 parent 2ad01eb commit 7b3c234
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions tools/crypto/ccp/test_dbc.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ def system_is_secured() -> bool:
class DynamicBoostControlTest(unittest.TestCase):
def __init__(self, data) -> None:
self.d = None
self.signature = "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
self.uid = "1111111111111111"
self.signature = b"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
self.uid = b"1111111111111111"
super().__init__(data)

def setUp(self) -> None:
Expand Down Expand Up @@ -192,12 +192,12 @@ def test_get_valid_param(self) -> None:
# SOC power
soc_power_max = process_param(self.d, PARAM_GET_SOC_PWR_MAX, self.signature)
soc_power_min = process_param(self.d, PARAM_GET_SOC_PWR_MIN, self.signature)
self.assertGreater(soc_power_max.parameter, soc_power_min.parameter)
self.assertGreater(soc_power_max[0], soc_power_min[0])

# fmax
fmax_max = process_param(self.d, PARAM_GET_FMAX_MAX, self.signature)
fmax_min = process_param(self.d, PARAM_GET_FMAX_MIN, self.signature)
self.assertGreater(fmax_max.parameter, fmax_min.parameter)
self.assertGreater(fmax_max[0], fmax_min[0])

# cap values
keys = {
Expand All @@ -208,7 +208,7 @@ def test_get_valid_param(self) -> None:
}
for k in keys:
result = process_param(self.d, keys[k], self.signature)
self.assertGreater(result.parameter, 0)
self.assertGreater(result[0], 0)

def test_get_invalid_param(self) -> None:
"""fetch an invalid parameter"""
Expand All @@ -226,35 +226,35 @@ def test_set_fmax(self) -> None:
original = process_param(self.d, PARAM_GET_FMAX_CAP, self.signature)

# set the fmax
target = original.parameter - 100
target = original[0] - 100
process_param(self.d, PARAM_SET_FMAX_CAP, self.signature, target)
time.sleep(SET_DELAY)
new = process_param(self.d, PARAM_GET_FMAX_CAP, self.signature)
self.assertEqual(new.parameter, target)
self.assertEqual(new[0], target)

# revert back to current
process_param(self.d, PARAM_SET_FMAX_CAP, self.signature, original.parameter)
process_param(self.d, PARAM_SET_FMAX_CAP, self.signature, original[0])
time.sleep(SET_DELAY)
cur = process_param(self.d, PARAM_GET_FMAX_CAP, self.signature)
self.assertEqual(cur.parameter, original.parameter)
self.assertEqual(cur[0], original[0])

def test_set_power_cap(self) -> None:
"""get/set power cap limit"""
# fetch current
original = process_param(self.d, PARAM_GET_PWR_CAP, self.signature)

# set the fmax
target = original.parameter - 10
target = original[0] - 10
process_param(self.d, PARAM_SET_PWR_CAP, self.signature, target)
time.sleep(SET_DELAY)
new = process_param(self.d, PARAM_GET_PWR_CAP, self.signature)
self.assertEqual(new.parameter, target)
self.assertEqual(new[0], target)

# revert back to current
process_param(self.d, PARAM_SET_PWR_CAP, self.signature, original.parameter)
process_param(self.d, PARAM_SET_PWR_CAP, self.signature, original[0])
time.sleep(SET_DELAY)
cur = process_param(self.d, PARAM_GET_PWR_CAP, self.signature)
self.assertEqual(cur.parameter, original.parameter)
self.assertEqual(cur[0], original[0])

def test_set_3d_graphics_mode(self) -> None:
"""set/get 3d graphics mode"""
Expand Down

0 comments on commit 7b3c234

Please sign in to comment.