Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions src/genie_python/genie_waitfor.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,10 @@ def start_waiting(
)

if block is not None:
if not isinstance(block, str):
error = "First argument must be a valid block name or None, not {}".format(block)
raise TypeError(error)

if not self.api.block_exists(block):
raise NameError('No block with the name "{}" exists'.format(block))
block = self.api.correct_blockname(block, add_prefix=False)
Expand Down
57 changes: 33 additions & 24 deletions tests/test_genie_waitfor.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,57 +28,66 @@ def setUp(self):
self.genie_waitfor = WaitForController(API())

def test_GIVEN_silent_waitfor_time_WHEN_waitfor_time_THEN_no_output(self):
capturedOutput = StringIO()
sys.stdout = capturedOutput
capturedoutput = StringIO()
sys.stdout = capturedoutput
self.genie_waitfor.start_waiting(seconds=0, quiet=True)
sys.stdout = sys.__stdout__
self.assertIs("", capturedOutput.getvalue())
self.assertIs("", capturedoutput.getvalue())

def test_GIVEN_waitfor_time_WHEN_waitfor_time_THEN_output(self):
capturedOutput = StringIO()
sys.stdout = capturedOutput
capturedoutput = StringIO()
sys.stdout = capturedoutput
self.genie_waitfor.start_waiting(seconds=0, quiet=False)
sys.stdout = sys.__stdout__
self.assertIsNot("", capturedOutput.getvalue())
self.assertIsNot("", capturedoutput.getvalue())

def test_GIVEN_silent_waitfor_uamps_WHEN_waitfor_uamps_THEN_no_output(self):
capturedOutput = StringIO()
sys.stdout = capturedOutput
capturedoutput = StringIO()
sys.stdout = capturedoutput
self.genie_waitfor.start_waiting(uamps=0, quiet=True)
sys.stdout = sys.__stdout__
self.assertIs("", capturedOutput.getvalue())
self.assertIs("", capturedoutput.getvalue())

def test_GIVEN_waitfor_uamps_WHEN_waitfor_uamps_THEN_output(self):
capturedOutput = StringIO()
sys.stdout = capturedOutput
capturedoutput = StringIO()
sys.stdout = capturedoutput
self.genie_waitfor.start_waiting(uamps=0, quiet=False)
sys.stdout = sys.__stdout__
self.assertIsNot("", capturedOutput.getvalue())
self.assertIsNot("", capturedoutput.getvalue())

def test_GIVEN_silent_waitfor_raw_frames_WHEN_waitfor_raw_frames_THEN_no_output(self):
capturedOutput = StringIO()
sys.stdout = capturedOutput
capturedoutput = StringIO()
sys.stdout = capturedoutput
self.genie_waitfor.start_waiting(raw_frames=0, quiet=True)
sys.stdout = sys.__stdout__
self.assertIs("", capturedOutput.getvalue())
self.assertIs("", capturedoutput.getvalue())

def test_GIVEN_waitfor_raw_frames_WHEN_waitfor_raw_frames_THEN_output(self):
capturedOutput = StringIO()
sys.stdout = capturedOutput
capturedoutput = StringIO()
sys.stdout = capturedoutput
self.genie_waitfor.start_waiting(raw_frames=0, quiet=False)
sys.stdout = sys.__stdout__
self.assertIsNot("", capturedOutput.getvalue())
self.assertIsNot("", capturedoutput.getvalue())

def test_GIVEN_silent_waitfor_mevents_WHEN_waitfor_mevents_THEN_no_output(self):
capturedOutput = StringIO()
sys.stdout = capturedOutput
capturedoutput = StringIO()
sys.stdout = capturedoutput
self.genie_waitfor.start_waiting(mevents=0, quiet=True)
sys.stdout = sys.__stdout__
self.assertIs("", capturedOutput.getvalue())
self.assertIs("", capturedoutput.getvalue())

def test_GIVEN_waitfor_mevents_WHEN_waitfor_mevents_THEN_output(self):
capturedOutput = StringIO()
sys.stdout = capturedOutput
capturedoutput = StringIO()
sys.stdout = capturedoutput
self.genie_waitfor.start_waiting(mevents=0, quiet=False)
sys.stdout = sys.__stdout__
self.assertIsNot("", capturedOutput.getvalue())
self.assertIsNot("", capturedoutput.getvalue())

def test_GIVEN_waitfor_block_WHEN_waitfor_block_integer_THEN_error_output(self):
# Exception condition
with self.assertRaises(TypeError) as context:
self.genie_waitfor.start_waiting(block=10) # pyright: ignore
self.assertEqual(
str(context.exception),
"First argument must be a valid block name or None, not {}".format(10),
)