diff --git a/tests/conftest.py b/tests/conftest.py index 80e69b1f..a458299e 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -440,8 +440,7 @@ def __init__(self, driver, base_address_list): self.product_id = { "vendor": "accelize.com", "library": "refdesign", - "name": "drm_%dactivator" % len(base_address_list), - "sign": "" + "name": "drm_%dactivator" % len(base_address_list) } def __getitem__(self, index): diff --git a/tests/test_hdk_compatibility.py b/tests/test_hdk_compatibility.py index e5ea882f..bf88a37d 100644 --- a/tests/test_hdk_compatibility.py +++ b/tests/test_hdk_compatibility.py @@ -187,11 +187,10 @@ def test_ctrl_version_match_mailbox_version(accelize_drm, conf_json, cred_json, ) as drm_manager: ctrl_version_str = drm_manager.get('controller_version') ctrl_rom = drm_manager.get('controller_rom') - ctrl_version_match = match(r'(\d+)\.(\d+)\.(\d+)\.\d+', ctrl_version_str) + ctrl_version_match = match(r'(\d+)\.(\d+)\.(\d+)', ctrl_version_str) rom_version_match = match(r'(\d+)\.(\d+)\.(\d+)\.\d+', ctrl_rom['extra']['lgdn_full_version']) ctrl_version = ''.join(map(lambda x: '%02X' % int(x,16), rom_version_match.groups())) rom_version = ''.join(map(lambda x: '%02X' % int(x,16), rom_version_match.groups())) assert rom_version == ctrl_version async_cb.assert_NoError() - diff --git a/tests/test_parameters.py b/tests/test_parameters.py index 0336c56b..7af41665 100644 --- a/tests/test_parameters.py +++ b/tests/test_parameters.py @@ -1210,7 +1210,7 @@ def test_parameter_key_modification_with_get_set(accelize_drm, conf_json, cred_j drm_manager.set(is_drm_software=True) async_cb.assert_Error(accelize_drm.exceptions.DRMBadArg.error_code," cannot be overwritten") async_cb.reset() - assert drm_manager.get('is_drm_software') == ref_timeout + assert drm_manager.get('is_drm_software') == accelize_drm.is_ctrl_sw async_cb.assert_NoError() print("Test parameter 'is_drm_software': PASS") @@ -1219,7 +1219,7 @@ def test_parameter_key_modification_with_get_set(accelize_drm, conf_json, cred_j drm_manager.set(controller_version=1) async_cb.assert_Error(accelize_drm.exceptions.DRMBadArg.error_code," cannot be overwritten") async_cb.reset() - assert match(r'00[0-9A-F]{6}', str(drm_manager.get('controller_version')).upper()) + assert match(r'\d+\.\d+\.\d+', drm_manager.get('controller_version')) async_cb.assert_NoError() print("Test parameter 'controller_version': PASS") @@ -1228,12 +1228,12 @@ def test_parameter_key_modification_with_get_set(accelize_drm, conf_json, cred_j drm_manager.set(controller_rom="{}") async_cb.assert_Error(accelize_drm.exceptions.DRMBadArg.error_code," cannot be overwritten") async_cb.reset() - rom = loads(drm_manager.get('controller_rom')) + rom = drm_manager.get('controller_rom') assert rom assert rom.get('extra') assert rom.get('product_id') assert rom.get('pkg_version') - assert rom.get('drm_software') + assert rom.get('drm_software') == accelize_drm.is_ctrl_sw async_cb.assert_NoError() print("Test parameter 'controller_version': PASS")