Skip to content

Pass timeout parameters to discover_single #744

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

Merged
rytilahti merged 2 commits into from
Feb 8, 2024
Merged

Pass timeout parameters to discover_single #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1e8471
Pass timeout parameters to discover_single
sdb9696 Feb 8, 2024
cbe9dc5
Fix tests
sdb9696 Feb 8, 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
9 changes: 7 additions & 2 deletions kasa/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def _device_to_serializable(val: Device):
@click.option(
"--discovery-timeout",
envvar="KASA_DISCOVERY_TIMEOUT",
default=3,
default=5,
required=False,
show_default=True,
help="Timeout for discovery.",
Expand Down Expand Up @@ -348,11 +348,16 @@ def _nop_echo(*args, **kwargs):
)
dev = await Device.connect(config=config)
else:
echo("No --type or --device-family and --encrypt-type defined, discovering..")
echo(
"No --type or --device-family and --encrypt-type defined, "
+ f"discovering for {discovery_timeout} seconds.."
)
dev = await Discover.discover_single(
host,
port=port,
credentials=credentials,
timeout=timeout,
discovery_timeout=discovery_timeout,
)

# Skip update on specific commands, or if device factory,
Expand Down
14 changes: 13 additions & 1 deletion kasa/tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from kasa import (
AuthenticationException,
Credentials,
Device,
EmeterStatus,
SmartDeviceException,
Expand Down Expand Up @@ -341,7 +342,9 @@ async def _state(dev: Device):
async def test_without_device_type(dev, mocker):
"""Test connecting without the device type."""
runner = CliRunner()
mocker.patch("kasa.discover.Discover.discover_single", return_value=dev)
discovery_mock = mocker.patch(
"kasa.discover.Discover.discover_single", return_value=dev
)
res = await runner.invoke(
cli,
[
Expand All @@ -351,9 +354,18 @@ async def test_without_device_type(dev, mocker):
"foo",
"--password",
"bar",
"--discovery-timeout",
"7",
],
)
assert res.exit_code == 0
discovery_mock.assert_called_once_with(
"127.0.0.1",
port=None,
credentials=Credentials("foo", "bar"),
timeout=5,
discovery_timeout=7,
)


@pytest.mark.parametrize("auth_param", ["--username", "--password"])
Expand Down