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

Commit

Permalink
Fix health test on package installation and hw run
Browse files Browse the repository at this point in the history
  • Loading branch information
xlz-jbleclere committed Jan 7, 2021
1 parent 0493ec8 commit a4a2a90
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 22 deletions.
4 changes: 2 additions & 2 deletions deployment/runTestFromPkgOnEc2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
displayName: Create Accelize credentials file
- script: |
sudo yum install -y yum-utils python3-pip python3-setuptools
sudo yum install -y yum-utils python3-pip
sudo yum-config-manager --add-repo https://tech.accelize.com/rpm/accelize_stable.repo
sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
sudo yum install -y python3-accelize-drm
Expand All @@ -91,7 +91,7 @@ jobs:
- script: |
sudo apt update
sudo apt install -y apt-transport-https software-properties-common lsb-release gnupg curl python3-pip python3-setuptools
sudo apt install -y apt-transport-https software-properties-common lsb-release gnupg curl python3-pip
curl -fsSL https://tech.accelize.com/gpg | sudo apt-key add -
sudo add-apt-repository "deb https://tech.accelize.com/deb $(lsb_release -cs) stable"
sudo apt update
Expand Down
4 changes: 0 additions & 4 deletions tests/test_async_health.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ def test_health_period_disabled(accelize_drm, conf_json, cred_json,


@pytest.mark.no_parallel
@pytest.mark.minimum
def test_health_period_modification(accelize_drm, conf_json, cred_json, async_handler,
live_server, request):
"""
Expand Down Expand Up @@ -125,7 +124,6 @@ def test_health_period_modification(accelize_drm, conf_json, cred_json, async_ha


@pytest.mark.no_parallel
@pytest.mark.minimum
def test_health_retry_disabled(accelize_drm, conf_json, cred_json, async_handler,
live_server, request):
"""
Expand Down Expand Up @@ -180,7 +178,6 @@ def test_health_retry_disabled(accelize_drm, conf_json, cred_json, async_handler


@pytest.mark.no_parallel
@pytest.mark.minimum
def test_health_retry_modification(accelize_drm, conf_json, cred_json,
async_handler, live_server, request):
"""
Expand Down Expand Up @@ -244,7 +241,6 @@ def test_health_retry_modification(accelize_drm, conf_json, cred_json,


@pytest.mark.no_parallel
@pytest.mark.minimum
def test_health_retry_sleep_modification(accelize_drm, conf_json, cred_json,
async_handler, live_server, request):
"""
Expand Down
1 change: 0 additions & 1 deletion tests/test_controller_memory.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from re import search, IGNORECASE


@pytest.mark.minimum
def test_wrong_drm_controller_address(accelize_drm, conf_json, cred_json, async_handler):
"""Test when a wrong DRM Controller offset is given"""
async_cb = async_handler.create()
Expand Down
30 changes: 15 additions & 15 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,21 @@ args_are_paths = False
install_command = python -m pip install -U --no-cache-dir --disable-pip-version-check {opts} {packages}

description =
build: Accelize DRM library, build
{c,cpp}: Accelize DRM Library tests ({envname})
build: Accelize DRM library build
{c,cpp,integration}: Accelize DRM Library tests ({envname})
coverage: Combine coverage data and create report

deps =
cython
flake8
flask
pytest
requests
setuptools
wheel
debug: pytest-cov
debug: coverage
debug: codecov
build: cython
build: setuptools
build: wheel
{c,cpp,integration}: pytest
{c,cpp,integration}: flake8
{c,cpp,integration}: flask
{c,cpp,integration}: requests
{c,cpp,integration}-debug: pytest-cov
{coverage,build-debug}: coverage
coverage: codecov
build-doc: sphinx_rtd_theme
build-doc: breathe

Expand All @@ -98,8 +98,8 @@ passenv=
sign: GPG_PUBLIC_KEY
sign: GPG_PASS_PHRASE
# Tests
{c,cpp}: TOX_*
{c,cpp}: XILINX_*
{c,cpp,integration}: TOX_*
{c,cpp,integration}: XILINX_*
aws: SDK_DIR

envdir =
Expand All @@ -109,7 +109,7 @@ envdir =
changedir =
!install: {envdir}/build
build-install: {envdir}/build
{c,cpp,package}-install: {toxinidir}
{c,cpp,integration,package}-install: {toxinidir}

commands =
# Force the use of system interpreter
Expand Down

0 comments on commit a4a2a90

Please sign in to comment.