Skip to content

Commit ef50fab

Browse files
committed
test: type netlib fully
1 parent 81af7d0 commit ef50fab

File tree

2 files changed

+39
-21
lines changed

2 files changed

+39
-21
lines changed

pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ module = [
7070
# test/common
7171
'testlib',
7272
'packagelib',
73+
'netlib',
7374
'js_coverage',
7475
'webdriver_bidi',
7576
]

test/common/netlib.py

+38-21
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,16 @@
1717

1818
import re
1919
import subprocess
20+
from collections.abc import Sequence, Set
2021

22+
from machine.machine_core.machine_virtual import VirtMachine
2123
from testlib import Error, MachineCase, wait
2224

2325

24-
class NetworkHelpers:
26+
class NetworkHelpers(MachineCase):
2527
"""Mix-in class for tests that require network setup"""
2628

27-
def add_veth(self, name, dhcp_cidr=None, dhcp_range=None):
29+
def add_veth(self, name: str, dhcp_cidr: str | None = None, dhcp_range: Sequence[str] | None = None) -> None:
2830
"""Add a veth device that is manageable with NetworkManager
2931
3032
This is safe for @nondestructive tests, the interface gets cleaned up automatically.
@@ -53,7 +55,7 @@ def add_veth(self, name, dhcp_cidr=None, dhcp_range=None):
5355
self.addCleanup(self.machine.execute, f"kill {server}; rm -rf /run/dnsmasq")
5456
self.machine.execute("if firewall-cmd --state >/dev/null 2>&1; then firewall-cmd --add-service=dhcp; fi")
5557

56-
def nm_activate_eth(self, iface):
58+
def nm_activate_eth(self, iface: str) -> None:
5759
"""Create an NM connection for a given interface"""
5860

5961
m = self.machine
@@ -62,26 +64,26 @@ def nm_activate_eth(self, iface):
6264
m.execute(f"nmcli con up {iface} ifname {iface}")
6365
self.addCleanup(m.execute, f"nmcli con delete {iface}")
6466

65-
def nm_checkpoints_disable(self):
67+
def nm_checkpoints_disable(self) -> None:
6668
self.browser.eval_js("window.cockpit_tests_disable_checkpoints = true;")
6769

68-
def nm_checkpoints_enable(self, settle_time=3.0):
70+
def nm_checkpoints_enable(self, settle_time: float = 3.0) -> None:
6971
self.browser.eval_js("window.cockpit_tests_disable_checkpoints = false;")
7072
self.browser.eval_js(f"window.cockpit_tests_checkpoint_settle_time = {settle_time};")
7173

7274

73-
class NetworkCase(MachineCase, NetworkHelpers):
74-
def setUp(self):
75+
class NetworkCase(NetworkHelpers):
76+
def setUp(self) -> None:
7577
super().setUp()
7678

7779
m = self.machine
7880

7981
# clean up after nondestructive tests
8082
if self.is_nondestructive():
81-
def devs():
83+
def devs() -> Set[str]:
8284
return set(self.machine.execute("ls /sys/class/net/ | grep -v bonding_masters").strip().split())
8385

84-
def cleanupDevs():
86+
def cleanupDevs() -> None:
8587
new = devs() - self.orig_devs
8688
self.machine.execute(f"for d in {' '.join(new)}; do nmcli dev del $d; done")
8789

@@ -140,8 +142,10 @@ def getit():
140142
print(f"{mac} -> {iface}")
141143
return iface
142144

143-
def add_iface(self, activate=True):
145+
def add_iface(self, activate: bool = True) -> str:
144146
m = self.machine
147+
assert isinstance(m, VirtMachine)
148+
assert self.network is not None
145149
mac = m.add_netiface(networking=self.network.interface())
146150
# Wait for the interface to show up
147151
self.get_iface(m, mac)
@@ -152,7 +156,7 @@ def add_iface(self, activate=True):
152156
self.nm_activate_eth(iface)
153157
return iface
154158

155-
def wait_for_iface(self, iface, active=True, state=None, prefix="10.111."):
159+
def wait_for_iface(self, iface: str, active: bool = True, state: str | None = None, prefix: str = "10.111.") -> None:
156160
sel = f"#networking-interfaces tr[data-interface='{iface}']"
157161

158162
if state:
@@ -170,31 +174,31 @@ def wait_for_iface(self, iface, active=True, state=None, prefix="10.111."):
170174
print(self.machine.execute(f"grep . /sys/class/net/*/address; nmcli con; nmcli dev; nmcli dev show {iface} || true"))
171175
raise e
172176

173-
def select_iface(self, iface):
177+
def select_iface(self, iface: str) -> None:
174178
b = self.browser
175179
b.click(f"#networking-interfaces tr[data-interface='{iface}'] button")
176180

177-
def iface_con_id(self, iface):
181+
def iface_con_id(self, iface: str) -> str | None:
178182
con_id = self.machine.execute(f"nmcli -m tabular -t -f GENERAL.CONNECTION device show {iface}").strip()
179183
if con_id == "" or con_id == "--":
180184
return None
181185
else:
182186
return con_id
183187

184-
def wait_for_iface_setting(self, setting_title, setting_value):
188+
def wait_for_iface_setting(self, setting_title: str, setting_value: str) -> None:
185189
b = self.browser
186190
b.wait_in_text(f"dt:contains('{setting_title}') + dd", setting_value)
187191

188-
def configure_iface_setting(self, setting_title):
192+
def configure_iface_setting(self, setting_title: str) -> None:
189193
b = self.browser
190194
b.click(f"dt:contains('{setting_title}') + dd button")
191195

192-
def ensure_nm_uses_dhclient(self):
196+
def ensure_nm_uses_dhclient(self) -> None:
193197
m = self.machine
194198
m.write("/etc/NetworkManager/conf.d/99-dhcp.conf", "[main]\ndhcp=dhclient\n")
195199
m.execute("systemctl restart NetworkManager")
196200

197-
def slow_down_dhclient(self, delay):
201+
def slow_down_dhclient(self, delay: int) -> None:
198202
self.machine.execute(f"""
199203
mkdir -p {self.vm_tmpdir}
200204
cp -a /usr/sbin/dhclient {self.vm_tmpdir}/dhclient.real
@@ -205,12 +209,25 @@ def slow_down_dhclient(self, delay):
205209
""")
206210
self.addCleanup(self.machine.execute, "umount /usr/sbin/dhclient")
207211

208-
def wait_onoff(self, sel, val):
212+
def wait_onoff(self, sel: str, *, val: bool) -> None:
209213
self.browser.wait_visible(sel + " input[type=checkbox]" + (":checked" if val else ":not(:checked)"))
210214

211-
def toggle_onoff(self, sel):
215+
def toggle_onoff(self, sel: str) -> None:
212216
self.browser.click(sel + " input[type=checkbox]")
213217

214-
def login_and_go(self, *args, **kwargs):
215-
super().login_and_go(*args, **kwargs)
218+
def login_and_go(
219+
self,
220+
path: str | None = None,
221+
*,
222+
user: str | None = None,
223+
password: str | None = None,
224+
host: str | None = None,
225+
superuser: bool = True,
226+
urlroot: str | None = None,
227+
tls: bool = False,
228+
enable_root_login: bool = False
229+
) -> None:
230+
super().login_and_go(path=path, user=user, password=password,
231+
host=host, superuser=superuser, urlroot=urlroot,
232+
tls=tls, enable_root_login=enable_root_login)
216233
self.nm_checkpoints_disable()

0 commit comments

Comments
 (0)