diff --git a/.github/workflows/github_actions_aws_rhel_python64.yml b/.github/workflows/github_actions_aws_rhel_python64.yml index a5230a68e..9c1170568 100644 --- a/.github/workflows/github_actions_aws_rhel_python64.yml +++ b/.github/workflows/github_actions_aws_rhel_python64.yml @@ -26,7 +26,7 @@ jobs: - self-hosted - linux - x64 - - rdss-nimibot-rhel-83-py64 + - rdss-nimibot-rhel-96-py64 timeout-minutes: 40 strategy: matrix: diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index 3f2aa0cb7..2f6bc8ddf 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -42,6 +42,9 @@ description = ${module_name}-system_tests: Run ${module_name} system tests (requires ${driver_name} runtime to be installed) ${module_name}-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions +allowlist_externals = + lsni + changedir = % if uses_other_wheel: ${wheel_env_no_py}: ../${other_wheel} @@ -60,6 +63,10 @@ commands = ${module_name}-system_tests: python ../../tools/install_local_wheel.py --driver ${other_wheel} --start-path ../.. % endif ${module_name}-system_tests: python -c "import ${module_name}; ${module_name}.print_diagnostic_information()" + ${module_name}-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" + ${module_name}-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None" + ${module_name}-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None" + ${module_name}-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" ${module_name}-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source ${module_name} --parallel-mode -m pytest ../../src/${module_name}/examples --junitxml=../junit/junit-${module_name}-{envname}-examples-{env:BITNESS:64}.xml {posargs} ${module_name}-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source ${module_name} --parallel-mode -m pytest ../../src/${module_name}/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-${module_name}-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs} diff --git a/generated/nidcpower/tox-system_tests.ini b/generated/nidcpower/tox-system_tests.ini index 47ec3a93a..68ea19d0d 100644 --- a/generated/nidcpower/tox-system_tests.ini +++ b/generated/nidcpower/tox-system_tests.ini @@ -14,6 +14,9 @@ description = nidcpower-system_tests: Run nidcpower system tests (requires NI-DCPower runtime to be installed) nidcpower-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions +allowlist_externals = + lsni + changedir = nidcpower-system_tests: . nidcpower-coverage: . @@ -22,6 +25,10 @@ commands = # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now nidcpower-system_tests: python -m pip install --disable-pip-version-check --upgrade pip nidcpower-system_tests: python -c "import nidcpower; nidcpower.print_diagnostic_information()" + nidcpower-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" + nidcpower-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None" + nidcpower-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None" + nidcpower-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" nidcpower-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidcpower --parallel-mode -m pytest ../../src/nidcpower/examples --junitxml=../junit/junit-nidcpower-{envname}-examples-{env:BITNESS:64}.xml {posargs} nidcpower-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidcpower --parallel-mode -m pytest ../../src/nidcpower/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nidcpower-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs} diff --git a/generated/nidigital/tox-system_tests.ini b/generated/nidigital/tox-system_tests.ini index 9b6f91b47..8057ce29c 100644 --- a/generated/nidigital/tox-system_tests.ini +++ b/generated/nidigital/tox-system_tests.ini @@ -15,6 +15,9 @@ description = nidigital-system_tests: Run nidigital system tests (requires NI-Digital Pattern Driver runtime to be installed) nidigital-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions +allowlist_externals = + lsni + changedir = nidigital-wheel_dep: ../nitclk nidigital-system_tests: . @@ -27,6 +30,10 @@ commands = nidigital-system_tests: python -m pip install --disable-pip-version-check --upgrade pip nidigital-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../.. nidigital-system_tests: python -c "import nidigital; nidigital.print_diagnostic_information()" + nidigital-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" + nidigital-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None" + nidigital-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None" + nidigital-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" nidigital-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidigital --parallel-mode -m pytest ../../src/nidigital/examples --junitxml=../junit/junit-nidigital-{envname}-examples-{env:BITNESS:64}.xml {posargs} nidigital-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidigital --parallel-mode -m pytest ../../src/nidigital/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nidigital-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs} diff --git a/generated/nidmm/tox-system_tests.ini b/generated/nidmm/tox-system_tests.ini index 834c3f2ec..e87c6d733 100644 --- a/generated/nidmm/tox-system_tests.ini +++ b/generated/nidmm/tox-system_tests.ini @@ -14,6 +14,9 @@ description = nidmm-system_tests: Run nidmm system tests (requires NI-DMM runtime to be installed) nidmm-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions +allowlist_externals = + lsni + changedir = nidmm-system_tests: . nidmm-coverage: . @@ -22,6 +25,10 @@ commands = # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now nidmm-system_tests: python -m pip install --disable-pip-version-check --upgrade pip nidmm-system_tests: python -c "import nidmm; nidmm.print_diagnostic_information()" + nidmm-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" + nidmm-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None" + nidmm-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None" + nidmm-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" nidmm-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidmm --parallel-mode -m pytest ../../src/nidmm/examples --junitxml=../junit/junit-nidmm-{envname}-examples-{env:BITNESS:64}.xml {posargs} nidmm-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidmm --parallel-mode -m pytest ../../src/nidmm/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nidmm-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs} diff --git a/generated/nifake/tox-system_tests.ini b/generated/nifake/tox-system_tests.ini index b575b61a3..5fde31fd0 100644 --- a/generated/nifake/tox-system_tests.ini +++ b/generated/nifake/tox-system_tests.ini @@ -15,6 +15,9 @@ description = nifake-system_tests: Run nifake system tests (requires NI-FAKE runtime to be installed) nifake-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions +allowlist_externals = + lsni + changedir = nifake-wheel_dep: ../nitclk nifake-system_tests: . @@ -27,6 +30,10 @@ commands = nifake-system_tests: python -m pip install --disable-pip-version-check --upgrade pip nifake-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../.. nifake-system_tests: python -c "import nifake; nifake.print_diagnostic_information()" + nifake-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" + nifake-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None" + nifake-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None" + nifake-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" nifake-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifake --parallel-mode -m pytest ../../src/nifake/examples --junitxml=../junit/junit-nifake-{envname}-examples-{env:BITNESS:64}.xml {posargs} nifake-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifake --parallel-mode -m pytest ../../src/nifake/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nifake-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs} diff --git a/generated/nifgen/tox-system_tests.ini b/generated/nifgen/tox-system_tests.ini index 78198bf6b..ec02788a5 100644 --- a/generated/nifgen/tox-system_tests.ini +++ b/generated/nifgen/tox-system_tests.ini @@ -15,6 +15,9 @@ description = nifgen-system_tests: Run nifgen system tests (requires NI-FGEN runtime to be installed) nifgen-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions +allowlist_externals = + lsni + changedir = nifgen-wheel_dep: ../nitclk nifgen-system_tests: . @@ -27,6 +30,10 @@ commands = nifgen-system_tests: python -m pip install --disable-pip-version-check --upgrade pip nifgen-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../.. nifgen-system_tests: python -c "import nifgen; nifgen.print_diagnostic_information()" + nifgen-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" + nifgen-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None" + nifgen-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None" + nifgen-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" nifgen-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifgen --parallel-mode -m pytest ../../src/nifgen/examples --junitxml=../junit/junit-nifgen-{envname}-examples-{env:BITNESS:64}.xml {posargs} nifgen-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifgen --parallel-mode -m pytest ../../src/nifgen/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nifgen-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs} diff --git a/generated/nimodinst/tox-system_tests.ini b/generated/nimodinst/tox-system_tests.ini index 02aedd7a0..3f0e6653e 100644 --- a/generated/nimodinst/tox-system_tests.ini +++ b/generated/nimodinst/tox-system_tests.ini @@ -14,6 +14,9 @@ description = nimodinst-system_tests: Run nimodinst system tests (requires NI-ModInst runtime to be installed) nimodinst-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions +allowlist_externals = + lsni + changedir = nimodinst-system_tests: . nimodinst-coverage: . @@ -22,6 +25,10 @@ commands = # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now nimodinst-system_tests: python -m pip install --disable-pip-version-check --upgrade pip nimodinst-system_tests: python -c "import nimodinst; nimodinst.print_diagnostic_information()" + nimodinst-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" + nimodinst-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None" + nimodinst-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None" + nimodinst-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" nimodinst-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nimodinst --parallel-mode -m pytest ../../src/nimodinst/examples --junitxml=../junit/junit-nimodinst-{envname}-examples-{env:BITNESS:64}.xml {posargs} nimodinst-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nimodinst --parallel-mode -m pytest ../../src/nimodinst/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nimodinst-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs} diff --git a/generated/nirfsg/tox-system_tests.ini b/generated/nirfsg/tox-system_tests.ini index f6a4e6b11..a04e63a71 100644 --- a/generated/nirfsg/tox-system_tests.ini +++ b/generated/nirfsg/tox-system_tests.ini @@ -15,6 +15,9 @@ description = nirfsg-system_tests: Run nirfsg system tests (requires NI-RFSG runtime to be installed) nirfsg-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions +allowlist_externals = + lsni + changedir = nirfsg-wheel_dep: ../nitclk nirfsg-system_tests: . @@ -27,6 +30,10 @@ commands = nirfsg-system_tests: python -m pip install --disable-pip-version-check --upgrade pip nirfsg-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../.. nirfsg-system_tests: python -c "import nirfsg; nirfsg.print_diagnostic_information()" + nirfsg-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" + nirfsg-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None" + nirfsg-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None" + nirfsg-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" nirfsg-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nirfsg --parallel-mode -m pytest ../../src/nirfsg/examples --junitxml=../junit/junit-nirfsg-{envname}-examples-{env:BITNESS:64}.xml {posargs} nirfsg-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nirfsg --parallel-mode -m pytest ../../src/nirfsg/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nirfsg-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs} diff --git a/generated/niscope/tox-system_tests.ini b/generated/niscope/tox-system_tests.ini index 6a4697f30..b66d8eed3 100644 --- a/generated/niscope/tox-system_tests.ini +++ b/generated/niscope/tox-system_tests.ini @@ -15,6 +15,9 @@ description = niscope-system_tests: Run niscope system tests (requires NI-SCOPE runtime to be installed) niscope-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions +allowlist_externals = + lsni + changedir = niscope-wheel_dep: ../nitclk niscope-system_tests: . @@ -27,6 +30,10 @@ commands = niscope-system_tests: python -m pip install --disable-pip-version-check --upgrade pip niscope-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../.. niscope-system_tests: python -c "import niscope; niscope.print_diagnostic_information()" + niscope-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" + niscope-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None" + niscope-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None" + niscope-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" niscope-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niscope --parallel-mode -m pytest ../../src/niscope/examples --junitxml=../junit/junit-niscope-{envname}-examples-{env:BITNESS:64}.xml {posargs} niscope-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niscope --parallel-mode -m pytest ../../src/niscope/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-niscope-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs} diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini index 71a03441e..e31b1f183 100644 --- a/generated/nise/tox-system_tests.ini +++ b/generated/nise/tox-system_tests.ini @@ -14,6 +14,9 @@ description = nise-system_tests: Run nise system tests (requires NI Switch Executive runtime to be installed) nise-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions +allowlist_externals = + lsni + changedir = nise-system_tests: . nise-coverage: . @@ -22,6 +25,10 @@ commands = # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now nise-system_tests: python -m pip install --disable-pip-version-check --upgrade pip nise-system_tests: python -c "import nise; nise.print_diagnostic_information()" + nise-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" + nise-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None" + nise-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None" + nise-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" nise-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nise --parallel-mode -m pytest ../../src/nise/examples --junitxml=../junit/junit-nise-{envname}-examples-{env:BITNESS:64}.xml {posargs} nise-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nise --parallel-mode -m pytest ../../src/nise/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nise-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs} diff --git a/generated/niswitch/tox-system_tests.ini b/generated/niswitch/tox-system_tests.ini index 1b91d3845..f1e64fd9b 100644 --- a/generated/niswitch/tox-system_tests.ini +++ b/generated/niswitch/tox-system_tests.ini @@ -14,6 +14,9 @@ description = niswitch-system_tests: Run niswitch system tests (requires NI-SWITCH runtime to be installed) niswitch-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions +allowlist_externals = + lsni + changedir = niswitch-system_tests: . niswitch-coverage: . @@ -22,6 +25,10 @@ commands = # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now niswitch-system_tests: python -m pip install --disable-pip-version-check --upgrade pip niswitch-system_tests: python -c "import niswitch; niswitch.print_diagnostic_information()" + niswitch-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" + niswitch-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None" + niswitch-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None" + niswitch-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" niswitch-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niswitch --parallel-mode -m pytest ../../src/niswitch/examples --junitxml=../junit/junit-niswitch-{envname}-examples-{env:BITNESS:64}.xml {posargs} niswitch-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niswitch --parallel-mode -m pytest ../../src/niswitch/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-niswitch-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs} diff --git a/generated/nitclk/tox-system_tests.ini b/generated/nitclk/tox-system_tests.ini index de0c1f037..439f78e95 100644 --- a/generated/nitclk/tox-system_tests.ini +++ b/generated/nitclk/tox-system_tests.ini @@ -15,6 +15,9 @@ description = nitclk-system_tests: Run nitclk system tests (requires NI-TClk runtime to be installed) nitclk-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions +allowlist_externals = + lsni + changedir = nitclk-wheel_dep: ../niscope nitclk-system_tests: . @@ -27,6 +30,10 @@ commands = nitclk-system_tests: python -m pip install --disable-pip-version-check --upgrade pip nitclk-system_tests: python ../../tools/install_local_wheel.py --driver niscope --start-path ../.. nitclk-system_tests: python -c "import nitclk; nitclk.print_diagnostic_information()" + nitclk-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" + nitclk-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None" + nitclk-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None" + nitclk-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None" nitclk-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nitclk --parallel-mode -m pytest ../../src/nitclk/examples --junitxml=../junit/junit-nitclk-{envname}-examples-{env:BITNESS:64}.xml {posargs} nitclk-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nitclk --parallel-mode -m pytest ../../src/nitclk/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nitclk-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs} diff --git a/src/niscope/system_tests/test_system_niscope.py b/src/niscope/system_tests/test_system_niscope.py index 60702465e..5ea4e8f2f 100644 --- a/src/niscope/system_tests/test_system_niscope.py +++ b/src/niscope/system_tests/test_system_niscope.py @@ -90,14 +90,24 @@ def multi_instrument_session_5171(self, session_creation_kwargs): # High channe @pytest.fixture(scope='function') def session_5124(self, session_creation_kwargs): with daqmx_sim_5124_lock: - with niscope.Session('5124', False, False, '', **session_creation_kwargs) as simulated_session: # 5124 is needed for video triggering - yield simulated_session + try: + with niscope.Session('5124', False, False, '', **session_creation_kwargs) as simulated_session: # 5124 is needed for video triggering + yield simulated_session + except niscope.Error as e: + if 'Invalid Identifier' in str(e): + pytest.skip('Skipping: simulated NI PXI-5124 is not available in this environment.') + raise @pytest.fixture(scope='function') def session_5142(self, session_creation_kwargs): with daqmx_sim_5142_lock: - with niscope.Session('5142', False, False, '', **session_creation_kwargs) as simulated_session: # 5142 is needed for OSP - yield simulated_session + try: + with niscope.Session('5142', False, False, '', **session_creation_kwargs) as simulated_session: # 5142 is needed for OSP + yield simulated_session + except niscope.Error as e: + if 'Invalid Identifier' in str(e): + pytest.skip('Skipping: simulated NI PXI-5142 is not available in this environment.') + raise # Attribute tests def test_vi_boolean_attribute(self, multi_instrument_session):