Skip to content

Commit 2b5be88

Browse files
committed
Revert "skip test if hv_netvsc driver is not used"
This reverts commit f6fdcf7.
1 parent d995b9d commit 2b5be88

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

lisa/microsoft/testsuites/network/netinterface.py

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
)
1919
from lisa.features import NetworkInterface, SerialConsole, Synthetic
2020
from lisa.operating_system import FreeBSD
21-
from lisa.tools import Ip, KernelConfig, Lsmod, Uname, Wget
21+
from lisa.tools import Ip, KernelConfig, Uname, Wget
2222
from lisa.util import perf_timer
2323

2424

@@ -48,7 +48,7 @@ class NetInterface(TestSuite):
4848
requirement=simple_requirement(network_interface=Synthetic()),
4949
)
5050
def validate_netvsc_reload(self, node: Node, log_path: Path) -> None:
51-
self._validate_netvsc_driver_status(node)
51+
self._validate_netvsc_built_in(node)
5252
network_interface_feature = node.features[NetworkInterface]
5353
# Test loading and unloading netvsc driver
5454
test_count = 0
@@ -111,7 +111,7 @@ def validate_netvsc_reload(self, node: Node, log_path: Path) -> None:
111111
def verify_network_interface_reload_via_ip_link(
112112
self, node: Node, log: Logger
113113
) -> None:
114-
self._validate_netvsc_driver_status(node)
114+
self._validate_netvsc_built_in(node)
115115
network_interface_feature = node.features[NetworkInterface]
116116

117117
# Ensure netvsc module is loaded
@@ -146,7 +146,7 @@ def verify_network_interface_reload_via_ip_link(
146146
"Cannot access internet from inside VM after test run."
147147
)
148148

149-
def _validate_netvsc_driver_status(self, node: Node) -> None:
149+
def _validate_netvsc_built_in(self, node: Node) -> None:
150150
if isinstance(node.os, FreeBSD):
151151
# Use command "config -x /boot/kernel/kernel | grep hyperv" can also check
152152
# if netvsc is build-in. The output "device hyperv" means the the hyperv
@@ -178,15 +178,5 @@ def _validate_netvsc_driver_status(self, node: Node) -> None:
178178
).exit_code
179179
== 0
180180
)
181-
if not is_built_in_module:
182-
lsmod_tool = node.tools[Lsmod]
183-
usedby_count, _ = lsmod_tool.get_used_by_modules(
184-
"hv_netvsc", sudo=True, force_run=True
185-
)
186-
if usedby_count == 0:
187-
raise SkippedException(
188-
"Skipping test since hv_netvsc module isn't used by "
189-
"network devices."
190-
)
191181
if is_built_in_module:
192182
raise SkippedException("Skipping test since hv_netvsc module is built-in")

0 commit comments

Comments
 (0)