Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Commit

Permalink
Update some tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@xlz-jbleclere
xlz-jbleclere committed Jul 13, 2022
1 parent 285a8c7 commit 633828f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion tests/test_async_health.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def test_health_period_modification(accelize_drm, conf_json, cred_json, async_ha
wait_start = data_list.pop(0)[1]
for i, (start, end) in enumerate(data_list):
delta = parser.parse(start) - parser.parse(wait_start)
assert int(delta.total_seconds()) == healthPeriod + i
assert int(delta.total_seconds()) >= healthPeriod
wait_start = end
assert get_proxy_error() is None

Expand Down
14 changes: 7 additions & 7 deletions tests/test_entitlement.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def test_entitlement_user1_metering(accelize_drm, conf_json, cred_json, async_ha
drm_manager.activate()
assert "Metering Web Service error 400" in str(excinfo.value)
assert "DRM WS request failed" in str(excinfo.value)
assert search(r'\\"No Entitlement\\" with .+ for \S+_test_01@accelize.com', str(excinfo.value))
assert search(r'No Entitlement.* with PT DRM Ref Design .+ for \S+_test_01@accelize.com', str(excinfo.value))
assert "User account has no entitlement. Purchase additional licenses via your portal" in str(excinfo.value)
assert async_handler.get_error_code(str(excinfo.value)) == accelize_drm.exceptions.DRMWSReqError.error_code
async_cb.assert_Error(accelize_drm.exceptions.DRMWSReqError.error_code, 'User account has no entitlement. Purchase additional licenses via your portal')
Expand Down Expand Up @@ -74,7 +74,7 @@ def test_entitlement_user1_nodelock(accelize_drm, conf_json, cred_json, async_ha
drm_manager.activate()
assert "Metering Web Service error 400" in str(excinfo.value)
assert "DRM WS request failed" in str(excinfo.value)
assert search(r'\\"No Entitlement\\" with .+ for \S+_test_01@accelize.com', str(excinfo.value))
assert search(r'No Entitlement.* with PT DRM Ref Design .+ for \S+_test_01@accelize.com', str(excinfo.value))
assert "User account has no entitlement. Purchase additional licenses via your portal" in str(excinfo.value)
assert async_handler.get_error_code(str(excinfo.value)) == accelize_drm.exceptions.DRMWSReqError.error_code
async_cb.assert_Error(accelize_drm.exceptions.DRMWSReqError.error_code, 'User account has no entitlement. Purchase additional licenses via your portal')
Expand Down Expand Up @@ -116,7 +116,7 @@ def test_entitlement_user2_metering(accelize_drm, conf_json, cred_json, async_ha
drm_manager.deactivate()
async_cb.assert_NoError()
log_content = logfile.read()
assert search(r'DRM session .{16} created', log_content, MULTILINE)
assert search(r'DRM session .{16} started', log_content, MULTILINE)
logfile.remove()


Expand Down Expand Up @@ -150,7 +150,7 @@ def test_entitlement_user2_nodelock(accelize_drm, conf_json, cred_json, async_ha
drm_manager.activate()
assert "Metering Web Service error 400" in str(excinfo.value)
assert "DRM WS request failed" in str(excinfo.value)
assert search(r'\\"No Entitlement\\" with .+ for \S+_test_02@accelize.com', str(excinfo.value))
assert search(r'No Entitlement.* with PT DRM Ref Design .+ for \S+_test_02@accelize.com', str(excinfo.value))
assert 'No valid NodeLocked entitlement found for your account' in str(excinfo.value)
assert async_handler.get_error_code(str(excinfo.value)) == accelize_drm.exceptions.DRMWSReqError.error_code
async_cb.assert_Error(accelize_drm.exceptions.DRMWSReqError.error_code, 'No valid NodeLocked entitlement found for your account')
Expand Down Expand Up @@ -193,7 +193,7 @@ def test_entitlement_user3_metering(accelize_drm, conf_json, cred_json, async_ha
drm_manager.deactivate()
async_cb.assert_NoError()
log_content = logfile.read()
assert search(r'DRM session .{16} created', log_content, MULTILINE)
assert search(r'DRM session .{16} started', log_content, MULTILINE)
logfile.remove()


Expand Down Expand Up @@ -265,7 +265,7 @@ def test_entitlement_user4_metering(accelize_drm, conf_json, cred_json, async_ha
drm_manager.deactivate()
async_cb.assert_NoError()
log_content = logfile.read()
assert search(r'DRM session .{16} created', log_content, MULTILINE)
assert search(r'DRM session .{16} started', log_content, MULTILINE)
logfile.remove()


Expand Down Expand Up @@ -299,7 +299,7 @@ def test_entitlement_user4_nodelock(accelize_drm, conf_json, cred_json, async_ha
drm_manager.activate()
assert "Metering Web Service error 400" in str(excinfo.value)
assert "DRM WS request failed" in str(excinfo.value)
assert search(r'\\"No Entitlement\\" with .+ for \S+_test_04@accelize.com', str(excinfo.value))
assert search(r'No Entitlement.* with PT DRM Ref Design .+ for \S+_test_04@accelize.com', str(excinfo.value))
assert 'No valid NodeLocked entitlement found for your account' in str(excinfo.value)
assert async_handler.get_error_code(str(excinfo.value)) == accelize_drm.exceptions.DRMWSReqError.error_code
async_cb.assert_Error(accelize_drm.exceptions.DRMWSReqError.error_code, 'No valid NodeLocked entitlement found for your account')
Expand Down
4 changes: 2 additions & 2 deletions tests/test_metered_mode_on_hw.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ def test_metering_limits_on_activate(accelize_drm, conf_json, cred_json, async_h
drm_manager.activate()
assert 'Metering Web Service error 400' in str(excinfo.value)
assert 'DRM WS request failed' in str(excinfo.value)
assert search(r'\\"Entitlement Limit Reached\\" with .+ for \S+_test_03@accelize.com', str(excinfo.value))
assert search(r'"Entitlement Limit Reached.* with PT DRM Ref Design .+ for \S+_test_03@accelize.com', str(excinfo.value))
assert 'You have reached the maximum quantity of 1000. usage_unit for metered entitlement (licensed)' in str(excinfo.value)
assert async_handler.get_error_code(str(excinfo.value)) == accelize_drm.exceptions.DRMWSReqError.error_code
async_cb.assert_Error(accelize_drm.exceptions.DRMWSReqError.error_code, 'You have reached the maximum quantity of 1000. usage_unit for metered entitlement')
Expand Down Expand Up @@ -543,7 +543,7 @@ def test_metering_limits_on_licensing_thread(accelize_drm, conf_json, cred_json,
assert async_cb.was_called
assert 'Metering Web Service error 400' in async_cb.message
assert 'DRM WS request failed' in async_cb.message
assert search(r'\\"Entitlement Limit Reached\\" with .+ for \S+_test_03@accelize.com', async_cb.message)
assert search(r'"Entitlement Limit Reached.* with PT DRM Ref Design .+ for \S+_test_03@accelize.com', async_cb.message)
assert 'You have reached the maximum quantity of 1000. usage_unit for metered entitlement (licensed)' in async_cb.message
assert async_cb.errcode == accelize_drm.exceptions.DRMWSReqError.error_code
drm_manager.deactivate()
Expand Down
4 changes: 2 additions & 2 deletions tests/test_nodelock_mode_on_hw.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def test_nodelock_license_is_not_given_to_inactive_user(accelize_drm, conf_json,
with pytest.raises(accelize_drm.exceptions.DRMWSReqError) as excinfo:
drm_manager.activate()
assert 'Metering Web Service error 400' in str(excinfo.value)
assert search(r'\\"No Entitlement\\" with .+ for \S+_test_01@accelize.com', str(excinfo.value))
assert search(r'No Entitlement.* with PT DRM Ref Design .+ for \S+_test_01@accelize.com', str(excinfo.value))
assert 'User account has no entitlement. Purchase additional licenses via your portal.' in str(excinfo.value)
err_code = async_handler.get_error_code(str(excinfo.value))
assert err_code == accelize_drm.exceptions.DRMWSReqError.error_code
Expand Down Expand Up @@ -322,7 +322,7 @@ def test_nodelock_limits(accelize_drm, conf_json, conf_json_second, cred_json, a
drm_manager1.activate()
assert 'Metering Web Service error 400' in str(excinfo.value)
assert 'DRM WS request failed' in str(excinfo.value)
assert search(r'\\"Entitlement Limit Reached\\" with .+ for \S+_test_03@accelize.com', str(excinfo.value))
assert search(r'"Entitlement Limit Reached.* with PT DRM Ref Design .+ for \S+_test_03@accelize.com', str(excinfo.value))
assert 'You have reached the maximum quantity of 1 nodes for Nodelocked entitlement' in str(excinfo.value)
err_code = async_handler.get_error_code(str(excinfo.value))
assert err_code == accelize_drm.exceptions.DRMWSReqError.error_code
Expand Down

0 comments on commit 633828f

Please sign in to comment.