Skip to content

DO NOT SUBMIT: Try using Session-based simulation for 5124, 5142 #2182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ni-jfitzger wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

DO NOT SUBMIT: Try using Session-based simulation for 5124, 5142 #2182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/niscope/system_tests/test_system_niscope.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ 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
with niscope.Session('5124', False, False, 'Simulate=1, DriverSetup=Model:5124; BoardType:PXI', **session_creation_kwargs) as simulated_session: # 5124 is needed for video triggering
yield simulated_session

@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
with niscope.Session('5142', False, False, 'Simulate=1, DriverSetup=Model:5142; BoardType:PXI', **session_creation_kwargs) as simulated_session: # 5142 is needed for OSP
yield simulated_session

# Attribute tests
Expand Down
Loading