Skip to content

Commit 8bbdf9f

Browse files
committed
test: further type netlib
Only add_iface and login_and_go is missing.
1 parent a1eac4a commit 8bbdf9f

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

test/common/netlib.py

+10-6
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,18 @@
1717

1818
import re
1919
import subprocess
20+
import unittest
2021

21-
from testlib import Error, MachineCase, wait
22+
from machine import testvm
23+
from testlib import Browser, Error, MachineCase, wait
2224

2325

24-
class NetworkHelpers:
26+
class NetworkHelpers(unittest.TestCase):
2527
"""Mix-in class for tests that require network setup"""
28+
browser: Browser
29+
machine: testvm.Machine
2630

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

56-
def nm_activate_eth(self, iface):
60+
def nm_activate_eth(self, iface: str) -> None:
5761
"""Create an NM connection for a given interface"""
5862

5963
m = self.machine
@@ -62,10 +66,10 @@ def nm_activate_eth(self, iface):
6266
m.execute(f"nmcli con up {iface} ifname {iface}")
6367
self.addCleanup(m.execute, f"nmcli con delete {iface}")
6468

65-
def nm_checkpoints_disable(self):
69+
def nm_checkpoints_disable(self) -> None:
6670
self.browser.eval_js("window.cockpit_tests_disable_checkpoints = true;")
6771

68-
def nm_checkpoints_enable(self, settle_time=3.0):
72+
def nm_checkpoints_enable(self, settle_time: float = 3.0) -> None:
6973
self.browser.eval_js("window.cockpit_tests_disable_checkpoints = false;")
7074
self.browser.eval_js(f"window.cockpit_tests_checkpoint_settle_time = {settle_time};")
7175

0 commit comments

Comments
 (0)