Skip to content

Commit 75f8e27

Browse files
authored
Merge pull request #749 from cdanis/fix-default-pytest
Fix pytest test collection on default install
2 parents f426699 + b42d338 commit 75f8e27

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

meshtastic/tests/test_analysis.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66

77
import pytest
88

9-
from meshtastic.analysis.__main__ import main
9+
try:
10+
# Depends upon matplotlib & other packages in poetry's analysis group, not installed by default
11+
from meshtastic.analysis.__main__ import main
12+
except ImportError:
13+
pytest.skip("Can't import meshtastic.analysis", allow_module_level=True)
1014

1115

1216
@pytest.mark.unit

meshtastic/tests/test_mesh_interface.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@
1111
from .. import BROADCAST_ADDR, LOCAL_ADDR
1212
from ..mesh_interface import MeshInterface, _timeago
1313
from ..node import Node
14-
from ..slog import LogSet
15-
from ..powermon import SimPowerSupply
14+
try:
15+
# Depends upon the powermon group, not installed by default
16+
from ..slog import LogSet
17+
from ..powermon import SimPowerSupply
18+
except ImportError:
19+
pytest.skip("Can't import LogSet or SimPowerSupply", allow_module_level=True)
1620

1721
# TODO
1822
# from ..config import Config

meshtastic/tests/test_tunnel.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
from meshtastic import mt_config
1010

1111
from ..tcp_interface import TCPInterface
12-
from ..tunnel import Tunnel, onTunnelReceive
12+
try:
13+
# Depends upon pytap2, not installed by default
14+
from ..tunnel import Tunnel, onTunnelReceive
15+
except ImportError:
16+
pytest.skip("Can't import Tunnel or onTunnelReceive", allow_module_level=True)
1317

1418

1519
@pytest.mark.unit

0 commit comments

Comments
 (0)