Skip to content
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

Jump to bottom

tests: Update test_client.py for tests to run efficiently on tox. #8

Merged
merged 11 commits into from
Sep 10, 2024
Merged

tests: Update test_client.py for tests to run efficiently on tox. #8

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
aca600d
tests: Update test_client.py for tests to run efficiently on tox.
u625355 Sep 10, 2024
3b61b27
fix: Update codecov.yml to have coverage target for 74%.
u625355 Sep 10, 2024
8d7141b
fix: Update pyproject.toml to have coverage target to 74%
u625355 Sep 10, 2024
af0c4e4
fix: Update test_client.py to fix trimming white spaces.
u625355 Sep 10, 2024
86597ca
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 10, 2024
a015fd3
fix: Update codecov.yml to have 75% coverage target
u625355 Sep 10, 2024
5f4e19e
fix: Update pyproject.toml to have 75% coverage
u625355 Sep 10, 2024
fb6a381
fix: Update codecov.yml for 74%
u625355 Sep 10, 2024
0964adc
fix: Update pyproject.toml for 74%
u625355 Sep 10, 2024
446e891
fix: Updated project version to 0.0.0 in toml file.
u625355 Sep 10, 2024
94e8880
fix: removed extra unnecessary line in test_client.py
u625355 Sep 10, 2024
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 codecov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ coverage:
status:
project:
default:
target: 80% # TODO: set to 100%
target: 74% # TODO: set to 100%
u625355 marked this conversation as resolved.
Show resolved Hide resolved
threshold: 0%
patch:
default:
target: 80% # TODO: set to 100%
target: 74% # TODO: set to 100%
threshold: 0%
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exclude_lines = [
"pragma: no cover",
"raise NotImplementedError"
]
fail_under = 80 # TODO: set to 100 after reaching 100% coverage
fail_under = 74 # TODO: set to 100 after reaching 100% coverage
u625355 marked this conversation as resolved.
Show resolved Hide resolved
show_missing = true
skip_empty = true

Expand Down
336 changes: 38 additions & 298 deletions tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ def test_server_connection(
tekhsi_client.verbose = True
# Use the context manager to handle connection
with tekhsi_client as connection:
# Assuming you have a method to check the connection status or similar
# Capture the printed output
captured = capsys.readouterr()
request = ConnectRequest(name="test_client")
response = connection.connection.Connect(request)
Expand Down Expand Up @@ -527,6 +525,7 @@ def test_instrumentation_enabled(tekhsi_client, initial_value, new_value, expect
), f"Expected new value {expected_value}, got {connection.instrumentation_enabled}"


#
u625355 marked this conversation as resolved.
Show resolved Hide resolved
u625355 marked this conversation as resolved.
Show resolved Hide resolved
@pytest.mark.parametrize(
"initial_symbols, expected_symbols",
[
Expand Down Expand Up @@ -724,242 +723,6 @@ def test_wait_for_data_new_and_next_acq(
assert connection._wait_for_data_holds_lock, "_wait_next_acq was not called"


@pytest.mark.parametrize(
"header, expected_waveform_type, expected_length",
[
(
WaveformHeader(
sourcename="ch1",
wfmtype=1,
verticalspacing=1.0,
verticaloffset=0.0,
verticalunits="V",
horizontalspacing=1.0,
horizontalUnits="s",
horizontalzeroindex=0,
sourcewidth=1,
noofsamples=4,
),
AnalogWaveform,
4,
),
(
WaveformHeader(
sourcename="ch2",
wfmtype=2,
verticalspacing=1.0,
verticaloffset=0.0,
verticalunits="V",
horizontalspacing=1.0,
horizontalUnits="s",
horizontalzeroindex=0,
sourcewidth=2,
noofsamples=4,
),
AnalogWaveform,
4,
),
(
WaveformHeader(
sourcename="ch3",
wfmtype=3,
verticalspacing=1.0,
verticaloffset=0.0,
verticalunits="V",
horizontalspacing=1.0,
horizontalUnits="s",
horizontalzeroindex=0,
sourcewidth=4,
noofsamples=4,
),
AnalogWaveform,
4,
),
(
WaveformHeader(
sourcename="math1",
wfmtype=7,
verticalspacing=1.0,
verticaloffset=0.0,
verticalunits="V",
horizontalspacing=1.0,
horizontalUnits="s",
horizontalzeroindex=0,
sourcewidth=1,
noofsamples=4,
iq_windowType="Hanning",
iq_fftLength=1024,
iq_rbw=10,
iq_span=100,
iq_centerFrequency=50,
),
IQWaveform,
4,
),
(
WaveformHeader(
sourcename="math2",
wfmtype=6,
verticalspacing=1.0,
verticaloffset=0.0,
verticalunits="V",
horizontalspacing=1.0,
horizontalUnits="s",
horizontalzeroindex=0,
sourcewidth=2,
noofsamples=4,
iq_windowType="Hamming",
iq_fftLength=1024,
iq_rbw=10,
iq_span=100,
iq_centerFrequency=50,
),
IQWaveform,
4,
),
(
WaveformHeader(
sourcename="ch4",
wfmtype=4,
verticalspacing=1.0,
verticaloffset=0.0,
verticalunits="V",
horizontalspacing=1.0,
horizontalUnits="s",
horizontalzeroindex=0,
sourcewidth=1,
noofsamples=4,
),
DigitalWaveform,
4,
),
(
WaveformHeader(
sourcename="math3",
wfmtype=7,
verticalspacing=1.0,
verticaloffset=0.0,
verticalunits="V",
horizontalspacing=1.0,
horizontalUnits="s",
horizontalzeroindex=0,
sourcewidth=1,
noofsamples=4,
iq_windowType="Rectangle",
iq_fftLength=1024,
iq_rbw=10,
iq_span=100,
iq_centerFrequency=50,
),
IQWaveform,
4,
),
(
WaveformHeader(
sourcename="math4",
wfmtype=7,
verticalspacing=1.0,
verticaloffset=0.0,
verticalunits="V",
horizontalspacing=1.0,
horizontalUnits="s",
horizontalzeroindex=0,
sourcewidth=1,
noofsamples=4,
iq_windowType="Kaiserbessel",
iq_fftLength=1024,
iq_rbw=10,
iq_span=100,
iq_centerFrequency=50,
),
IQWaveform,
4,
),
(
WaveformHeader(
sourcename="math5",
wfmtype=7,
verticalspacing=1.0,
verticaloffset=0.0,
verticalunits="V",
horizontalspacing=1.0,
horizontalUnits="s",
horizontalzeroindex=0,
sourcewidth=1,
noofsamples=4,
iq_windowType="Unsupported",
iq_fftLength=1024,
iq_rbw=10,
iq_span=100,
iq_centerFrequency=50,
),
IQWaveform,
4,
),
(
WaveformHeader(
sourcename="math6",
wfmtype=7,
verticalspacing=1.0,
verticaloffset=0.0,
verticalunits="V",
horizontalspacing=1.0,
horizontalUnits="s",
horizontalzeroindex=0,
sourcewidth=1,
noofsamples=4,
iq_windowType="Blackharris",
iq_fftLength=1024,
iq_rbw=10,
iq_span=100,
iq_centerFrequency=50,
),
IQWaveform,
4,
),
(
WaveformHeader(
sourcename="math7",
wfmtype=7,
verticalspacing=1.0,
verticaloffset=0.0,
verticalunits="V",
horizontalspacing=1.0,
horizontalUnits="s",
horizontalzeroindex=0,
sourcewidth=1,
noofsamples=4,
iq_windowType="Flattop2",
iq_fftLength=1024,
iq_rbw=10,
iq_span=100,
iq_centerFrequency=50,
),
IQWaveform,
4,
),
],
)
def test_read_waveform(tekhsi_client, header, expected_waveform_type, expected_length):
u625355 marked this conversation as resolved.
Show resolved Hide resolved
"""Test the _read_waveform method of TekHSIConnect.

Args:
tekhsi_client (TekHSIConnect): An instance of the TekHSI client to be tested.
header (WaveformHeader): The header information for the waveform.
expected_waveform_type (type): The expected type of the waveform (e.g., AnalogWaveform, IQWaveform, DigitalWaveform).
expected_length (int): The expected length of the waveform data.
"""
waveform = tekhsi_client._read_waveform(header)
assert isinstance(waveform, expected_waveform_type)
assert (
len(waveform.y_axis_values) == expected_length
if expected_waveform_type == AnalogWaveform
else len(waveform.interleaved_iq_axis_values) == expected_length
if expected_waveform_type == IQWaveform
else len(waveform.y_axis_byte_values) == expected_length
)


@pytest.mark.parametrize(
"headers, expected_datasize",
[
Expand Down Expand Up @@ -1198,66 +961,6 @@ def test_read_waveform_digital(tekhsi_client, header, response_data, expected_le
assert len(waveform.y_axis_byte_values) == expected_length


class DummyThread:
def __init__(self, should_raise=False):
self.should_raise = should_raise
self.join_called = False

def join(self, timeout=None):
self.join_called = True
if self.should_raise:
raise RuntimeError("Thread error")


@pytest.mark.parametrize(
"connected, verbose, thread_active, should_raise, expected_output",
[
(False, False, False, False, ""), # Not connected
(True, True, True, False, "close"), # Verbose output
(True, False, True, False, ""), # Thread handling without verbose
],
)
def test_close(
u625355 marked this conversation as resolved.
Show resolved Hide resolved
tekhsi_client, capsys, connected, verbose, thread_active, should_raise, expected_output
):
"""Test the close method of TekHSIConnect.

Args:
tekhsi_client (TekHSIConnect): An instance of the TekHSI client to be tested.
capsys (CaptureFixture): Pytest fixture to capture stdout and stderr.
connected (bool): Whether the client is connected.
verbose (bool): Whether verbose output is enabled.
thread_active (bool): Whether the thread is active.
should_raise (bool): Whether the thread should raise an error.
expected_output (str): The expected output message, if any.
"""
tekhsi_client._connected = connected
tekhsi_client.verbose = verbose
tekhsi_client.thread_active = thread_active
tekhsi_client.thread = DummyThread(should_raise)

# Mock the _available_symbols method to raise KeyError
def mock_available_symbols(self):
raise KeyError("test_key")

tekhsi_client._available_symbols = mock_available_symbols

tekhsi_client.close()

captured = capsys.readouterr()
output_lines = captured.out.split("\n")
expected_lines = expected_output.split("\n")

for expected_line in expected_lines:
assert any(expected_line in line for line in output_lines)

if connected and thread_active:
assert tekhsi_client.thread.join_called
assert not tekhsi_client.thread_active
else:
assert not tekhsi_client.thread.join_called


class DummyConnection:
def __init__(self, holding_scope_open):
"""Initialize the DummyConnection.
Expand Down Expand Up @@ -1303,6 +1006,23 @@ def test_terminate(setup_tekhsi_connections):
assert conn2.close_called


def test_active_symbols(tekhsi_client):
"""Test the active_symbols method of TekHSIConnect.

Args:
tekhsi_client (TekHSIConnect): An instance of the TekHSI client to be tested.
"""
symbols = ["symbol1", "symbol2", "symbol3"]

# Call the method to set active symbols
tekhsi_client.active_symbols(symbols)

# Verify that the activesymbols attribute is updated correctly
assert (
tekhsi_client.activesymbols == symbols
), f"Expected {symbols}, got {tekhsi_client.activesymbols}"


def test_callback_invocation(tekhsi_client):
"""Test the invocation of the callback function in TekHSIConnect.

Expand All @@ -1317,3 +1037,23 @@ def real_callback(waveforms):
waveforms = ["waveform1", "waveform2"]

tekhsi_client._callback(waveforms)


@pytest.mark.parametrize(
"header, expected_sample_rate",
[
(
WaveformHeader(wfmtype=6, iq_windowType="Blackharris", iq_fftLength=1024, iq_rbw=1e6),
1024 * 1e6 / 1.9,
),
(
WaveformHeader(wfmtype=6, iq_windowType="Flattop2", iq_fftLength=1024, iq_rbw=1e6),
1024 * 1e6 / 3.77,
),
],
)
def test_read_waveform_iq(tekhsi_client, header, expected_sample_rate):
waveform = tekhsi_client._read_waveform(header)

assert isinstance(waveform, IQWaveform)
assert waveform.meta_info.iq_sample_rate == pytest.approx(expected_sample_rate)
Loading