From a831ef7945c2fd6abc284dba4afd6f9a702101ad Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Fri, 19 Apr 2024 22:53:18 -0500 Subject: [PATCH] Revert "Create SwitchExecutiveExample VD before running system tests" This reverts commit 41bc4cbbfc170457dbc9c72ef4e48eab2a116a92. --- build/templates/tox-system_tests.ini.mako | 9 --------- generated/nise/tox-system_tests.ini | 5 ----- 2 files changed, 14 deletions(-) diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index 7a4565f35..a8c6d982c 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -33,11 +33,6 @@ ignore_basepython_conflict=True toxworkdir = ../../../.tox [testenv] -% if module_name == 'nise': -allowlist_externals = - C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe - -% endif description = % if uses_other_wheel: ${wheel_env_no_py}: Build the ${other_wheel} wheel because we use it in ${module_name} tests @@ -56,10 +51,6 @@ commands = % if uses_other_wheel: ${wheel_env_no_py}: python -m build --wheel -% endif -% if module_name == 'nise': - # Create SwitchExecutiveExample Virtual Device, if it's missing. This device is used by the tests. - nise-system_tests: "C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe" s % endif # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now ${module_name}-system_tests: python -m pip install --disable-pip-version-check --upgrade pip diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini index b20b86338..1a7f41eaf 100644 --- a/generated/nise/tox-system_tests.ini +++ b/generated/nise/tox-system_tests.ini @@ -10,9 +10,6 @@ ignore_basepython_conflict=True toxworkdir = ../../../.tox [testenv] -allowlist_externals = - C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe - 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 @@ -22,8 +19,6 @@ changedir = nise-coverage: . commands = - # Create SwitchExecutiveExample Virtual Device, if it's missing. This device is used by the tests. - nise-system_tests: "C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe" s # --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()"