summaryrefslogtreecommitdiff
path: root/smoketest
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-12-29 21:51:24 +0100
committerChristian Poessinger <christian@poessinger.com>2020-12-29 22:47:04 +0100
commitf2b2bbdd51cb00a8be1aefa1f9028212fcffc1d3 (patch)
tree9b799a6f53c6bc05d5de2444873145f2ccd0591d /smoketest
parent5b6b865b71415a1be9d5a758dfbccb81906f2f2a (diff)
downloadvyos-1x-f2b2bbdd51cb00a8be1aefa1f9028212fcffc1d3.tar.gz
vyos-1x-f2b2bbdd51cb00a8be1aefa1f9028212fcffc1d3.zip
smoketest: adjust test method names
This is for better readability during testruns
Diffstat (limited to 'smoketest')
-rw-r--r--smoketest/scripts/cli/base_accel_ppp_test.py12
-rwxr-xr-xsmoketest/scripts/cli/test_interfaces_bonding.py9
-rwxr-xr-xsmoketest/scripts/cli/test_interfaces_loopback.py4
-rwxr-xr-xsmoketest/scripts/cli/test_interfaces_macsec.py14
-rwxr-xr-xsmoketest/scripts/cli/test_interfaces_openvpn.py52
-rwxr-xr-xsmoketest/scripts/cli/test_interfaces_pppoe.py6
-rwxr-xr-xsmoketest/scripts/cli/test_interfaces_tunnel.py22
-rwxr-xr-xsmoketest/scripts/cli/test_interfaces_wireguard.py12
-rwxr-xr-xsmoketest/scripts/cli/test_interfaces_wireless.py14
-rwxr-xr-xsmoketest/scripts/cli/test_nat.py8
-rwxr-xr-xsmoketest/scripts/cli/test_service_bcast-relay.py3
-rwxr-xr-xsmoketest/scripts/cli/test_service_dns_dynamic.py7
-rwxr-xr-xsmoketest/scripts/cli/test_service_dns_forwarding.py8
-rwxr-xr-xsmoketest/scripts/cli/test_service_pppoe-server.py20
-rwxr-xr-xsmoketest/scripts/cli/test_service_snmp.py10
-rwxr-xr-xsmoketest/scripts/cli/test_service_ssh.py16
-rwxr-xr-xsmoketest/scripts/cli/test_service_webproxy.py2
-rwxr-xr-xsmoketest/scripts/cli/test_system_ip.py9
-rwxr-xr-xsmoketest/scripts/cli/test_system_login.py6
-rwxr-xr-xsmoketest/scripts/cli/test_system_nameserver.py8
-rwxr-xr-xsmoketest/scripts/cli/test_system_ntp.py4
-rwxr-xr-xsmoketest/scripts/system/test_kernel_options.py8
22 files changed, 116 insertions, 138 deletions
diff --git a/smoketest/scripts/cli/base_accel_ppp_test.py b/smoketest/scripts/cli/base_accel_ppp_test.py
index e46a16137..705c932b4 100644
--- a/smoketest/scripts/cli/base_accel_ppp_test.py
+++ b/smoketest/scripts/cli/base_accel_ppp_test.py
@@ -56,8 +56,8 @@ class BasicAccelPPPTest:
def verify(self, conf):
self.assertEqual(conf['core']['thread-count'], str(get_half_cpus()))
- def test_name_servers(self):
- """ Verify proper Name-Server configuration for IPv4 and IPv6 """
+ def test_accel_name_servers(self):
+ # Verify proper Name-Server configuration for IPv4 and IPv6
self.basic_config()
nameserver = ['192.0.2.1', '192.0.2.2', '2001:db8::1']
@@ -78,8 +78,8 @@ class BasicAccelPPPTest:
else:
self.assertEqual(conf['ipv6-dns'][ns], None)
- def test_authentication_local(self):
- """ Test configuration of local authentication """
+ def test_accel_local_authentication(self):
+ # Test configuration of local authentication
self.basic_config()
# upload / download limit
@@ -134,8 +134,8 @@ class BasicAccelPPPTest:
# Check for running process
self.assertTrue(process_named_running(self._process_name))
- def test_authentication_radius(self):
- """ Test configuration of RADIUS authentication for PPPoE server """
+ def test_accel_radius_authentication(self):
+ # Test configuration of RADIUS authentication for PPPoE server
self.basic_config()
radius_server = '192.0.2.22'
diff --git a/smoketest/scripts/cli/test_interfaces_bonding.py b/smoketest/scripts/cli/test_interfaces_bonding.py
index a7355f418..d38e11a63 100755
--- a/smoketest/scripts/cli/test_interfaces_bonding.py
+++ b/smoketest/scripts/cli/test_interfaces_bonding.py
@@ -52,7 +52,6 @@ class BondingInterfaceTest(BasicInterfaceTest.BaseTest):
def test_add_single_ip_address(self):
- """ derived method to check if member interfaces are enslaved properly """
super().test_add_single_ip_address()
for interface in self._interfaces:
@@ -66,10 +65,10 @@ class BondingInterfaceTest(BasicInterfaceTest.BaseTest):
slaves = read_file(f'/sys/class/net/{interface}/bonding/slaves').split()
self.assertListEqual(slaves, self._members)
- def test_remove_member(self):
- """ T2515: when removing a bond member the previously enslaved/member
- interface must be in its former admin-up/down state. Here we ensure that
- it is admin-up as it was admin-up before. """
+ def test_bonding_remove_member(self):
+ # T2515: when removing a bond member the previously enslaved/member
+ # interface must be in its former admin-up/down state. Here we ensure
+ # that it is admin-up as it was admin-up before.
# configure member interfaces
for interface in self._interfaces:
diff --git a/smoketest/scripts/cli/test_interfaces_loopback.py b/smoketest/scripts/cli/test_interfaces_loopback.py
index 549a679fc..79225a1bd 100755
--- a/smoketest/scripts/cli/test_interfaces_loopback.py
+++ b/smoketest/scripts/cli/test_interfaces_loopback.py
@@ -32,8 +32,8 @@ class LoopbackInterfaceTest(BasicInterfaceTest.BaseTest):
for addr in self._loopback_addresses:
self.assertTrue(is_intf_addr_assigned('lo', addr))
- def test_add_address_multi(self):
- super().test_add_address_multi()
+ def test_add_multiple_ip_addresses(self):
+ super().test_add_multiple_ip_addresses()
for addr in self._loopback_addresses:
self.assertTrue(is_intf_addr_assigned('lo', addr))
diff --git a/smoketest/scripts/cli/test_interfaces_macsec.py b/smoketest/scripts/cli/test_interfaces_macsec.py
index 2dff848d4..d9635951f 100755
--- a/smoketest/scripts/cli/test_interfaces_macsec.py
+++ b/smoketest/scripts/cli/test_interfaces_macsec.py
@@ -43,10 +43,10 @@ class MACsecInterfaceTest(BasicInterfaceTest.BaseTest):
self._interfaces = list(self._options)
- def test_encryption(self):
- """ MACsec can be operating in authentication and encryption mode - both
- using different mandatory settings, lets test encryption as the basic
- authentication test has been performed using the base class tests """
+ def test_macsec_encryption(self):
+ # MACsec can be operating in authentication and encryption mode - both
+ # using different mandatory settings, lets test encryption as the basic
+ # authentication test has been performed using the base class tests
mak_cak = '232e44b7fda6f8e2d88a07bf78a7aff4'
mak_ckn = '40916f4b23e3d548ad27eedd2d10c6f98c2d21684699647d63d41b500dfe8836'
@@ -105,7 +105,7 @@ class MACsecInterfaceTest(BasicInterfaceTest.BaseTest):
# Check for running process
self.assertTrue(process_named_running('wpa_supplicant'))
- def test_mandatory_options(self):
+ def test_macsec_mandatory_options(self):
interface = 'macsec1'
self.session.set(self._base_path + [interface])
@@ -123,8 +123,8 @@ class MACsecInterfaceTest(BasicInterfaceTest.BaseTest):
self.session.commit()
self.assertIn(interface, interfaces())
- def test_source_interface(self):
- """ Ensure source-interface can bot be part of any other bond or bridge """
+ def test_macsec_source_interface(self):
+ # Ensure source-interface can bot be part of any other bond or bridge
base_bridge = ['interfaces', 'bridge', 'br200']
base_bond = ['interfaces', 'bonding', 'bond200']
diff --git a/smoketest/scripts/cli/test_interfaces_openvpn.py b/smoketest/scripts/cli/test_interfaces_openvpn.py
index e9f905ce8..00db3f667 100755
--- a/smoketest/scripts/cli/test_interfaces_openvpn.py
+++ b/smoketest/scripts/cli/test_interfaces_openvpn.py
@@ -71,10 +71,8 @@ class TestInterfacesOpenVPN(unittest.TestCase):
self.session.commit()
del self.session
- def test_client_verify(self):
- """
- Create OpenVPN client interface and test verify() steps.
- """
+ def test_openvpn_client_verify(self):
+ # Create OpenVPN client interface and test verify() steps.
interface = 'vtun2000'
path = base_path + [interface]
self.session.set(path + ['mode', 'client'])
@@ -144,11 +142,9 @@ class TestInterfacesOpenVPN(unittest.TestCase):
self.assertIn(interface, interfaces())
- def test_client_interfaces(self):
- """
- Create OpenVPN client interfaces connecting to different
- server IP addresses. Validate configuration afterwards.
- """
+ def test_openvpn_client_interfaces(self):
+ # Create OpenVPN client interfaces connecting to different
+ # server IP addresses. Validate configuration afterwards.
num_range = range(10, 15)
for ii in num_range:
interface = f'vtun{ii}'
@@ -211,10 +207,8 @@ class TestInterfacesOpenVPN(unittest.TestCase):
interface = f'vtun{ii}'
self.assertNotIn(interface, interfaces())
- def test_server_verify(self):
- """
- Create one OpenVPN server interface and check required verify() stages
- """
+ def test_openvpn_server_verify(self):
+ # Create one OpenVPN server interface and check required verify() stages
interface = 'vtun5000'
path = base_path + [interface]
@@ -321,11 +315,10 @@ class TestInterfacesOpenVPN(unittest.TestCase):
self.assertTrue(process_named_running(PROCESS_NAME))
self.assertIn(interface, interfaces())
- def test_server_subnet_topology(self):
- """
- Create OpenVPN server interfaces using different client subnets.
- Validate configuration afterwards.
- """
+ def test_openvpn_server_subnet_topology(self):
+ # Create OpenVPN server interfaces using different client subnets.
+ # Validate configuration afterwards.
+
auth_hash = 'sha256'
num_range = range(20, 25)
port = ''
@@ -418,11 +411,9 @@ class TestInterfacesOpenVPN(unittest.TestCase):
interface = f'vtun{ii}'
self.assertNotIn(interface, interfaces())
- def test_server_net30_topology(self):
- """
- Create OpenVPN server interfaces (net30) using different client
- subnets. Validate configuration afterwards.
- """
+ def test_openvpn_server_net30_topology(self):
+ # Create OpenVPN server interfaces (net30) using different client
+ # subnets. Validate configuration afterwards.
auth_hash = 'sha256'
num_range = range(20, 25)
port = ''
@@ -495,10 +486,10 @@ class TestInterfacesOpenVPN(unittest.TestCase):
interface = f'vtun{ii}'
self.assertNotIn(interface, interfaces())
- def test_site2site_verify(self):
- """
- Create one OpenVPN site2site interface and check required verify() stages
- """
+ def test_openvpn_site2site_verify(self):
+ # Create one OpenVPN site2site interface and check required
+ # verify() stages
+
interface = 'vtun5000'
path = base_path + [interface]
@@ -554,10 +545,9 @@ class TestInterfacesOpenVPN(unittest.TestCase):
self.session.commit()
- def test_site2site_interfaces_tun(self):
- """
- Create two OpenVPN site-to-site interfaces
- """
+ def test_openvpn_site2site_interfaces_tun(self):
+ # Create two OpenVPN site-to-site interfaces
+
num_range = range(30, 35)
port = ''
local_address = ''
diff --git a/smoketest/scripts/cli/test_interfaces_pppoe.py b/smoketest/scripts/cli/test_interfaces_pppoe.py
index 2580566cd..6bfe35d86 100755
--- a/smoketest/scripts/cli/test_interfaces_pppoe.py
+++ b/smoketest/scripts/cli/test_interfaces_pppoe.py
@@ -53,8 +53,8 @@ class PPPoEInterfaceTest(unittest.TestCase):
self.session.commit()
del self.session
- def test_pppoe(self):
- """ Check if PPPoE dialer can be configured and runs """
+ def test_pppoe_client(self):
+ # Check if PPPoE dialer can be configured and runs
for interface in self._interfaces:
user = 'VyOS-user-' + interface
passwd = 'VyOS-passwd-' + interface
@@ -98,7 +98,7 @@ class PPPoEInterfaceTest(unittest.TestCase):
self.assertTrue(running)
def test_pppoe_dhcpv6pd(self):
- """ Check if PPPoE dialer can be configured with DHCPv6-PD """
+ # Check if PPPoE dialer can be configured with DHCPv6-PD
address = '1'
sla_id = '0'
sla_len = '8'
diff --git a/smoketest/scripts/cli/test_interfaces_tunnel.py b/smoketest/scripts/cli/test_interfaces_tunnel.py
index 676b207c7..45679e280 100755
--- a/smoketest/scripts/cli/test_interfaces_tunnel.py
+++ b/smoketest/scripts/cli/test_interfaces_tunnel.py
@@ -156,9 +156,9 @@ class TunnelInterfaceTest(BasicInterfaceTest.BaseTest):
self.assertEqual(self.local_v6, conf['linkinfo']['info_data']['local'])
self.assertEqual(remote_ip6, conf['linkinfo']['info_data']['remote'])
- def test_verify_ipv4_local_remote_addr(self):
- """ When running tests ensure that for certain encapsulation types the
- local and remote IP address is actually an IPv4 address """
+ def test_tunnel_verify_ipv4_local_remote_addr(self):
+ # When running tests ensure that for certain encapsulation types the
+ # local and remote IP address is actually an IPv4 address
interface = f'tun1000'
local_if_addr = f'10.10.200.1/24'
@@ -185,9 +185,9 @@ class TunnelInterfaceTest(BasicInterfaceTest.BaseTest):
self.session.delete(self._base_path + [interface])
self.session.commit()
- def test_verify_ipv6_local_remote_addr(self):
- """ When running tests ensure that for certain encapsulation types the
- local and remote IP address is actually an IPv6 address """
+ def test_tunnel_verify_ipv6_local_remote_addr(self):
+ # When running tests ensure that for certain encapsulation types the
+ # local and remote IP address is actually an IPv6 address
interface = f'tun1010'
local_if_addr = f'10.10.200.1/24'
@@ -214,8 +214,8 @@ class TunnelInterfaceTest(BasicInterfaceTest.BaseTest):
self.session.delete(self._base_path + [interface])
self.session.commit()
- def test_verify_local_dhcp(self):
- """ We can not use local-ip and dhcp-interface at the same time """
+ def test_tunnel_verify_local_dhcp(self):
+ # We can not use local-ip and dhcp-interface at the same time
interface = f'tun1020'
local_if_addr = f'10.0.0.1/24'
@@ -234,7 +234,7 @@ class TunnelInterfaceTest(BasicInterfaceTest.BaseTest):
# Check if commit is ok
self.session.commit()
- def test_ip6ip6(self):
+ def test_tunnel_ip6ip6(self):
interface = 'tun120'
encapsulation = 'ip6ip6'
local_if_addr = '2001:db8:f00::1/24'
@@ -270,7 +270,7 @@ class TunnelInterfaceTest(BasicInterfaceTest.BaseTest):
self.assertEqual(self.local_v6, conf['linkinfo']['info_data']['local'])
self.assertEqual(remote_ip6, conf['linkinfo']['info_data']['remote'])
- def test_gre_ipv4(self):
+ def test_tunnel_gre_ipv4(self):
interface = 'tun200'
encapsulation = 'gre'
local_if_addr = '172.16.1.1/24'
@@ -340,7 +340,7 @@ class TunnelInterfaceTest(BasicInterfaceTest.BaseTest):
self.assertEqual(remote_ip6, conf['linkinfo']['info_data']['remote'])
- def test_sit(self):
+ def test_tunnel_sit(self):
interface = 'tun300'
encapsulation = 'sit'
local_if_addr = '172.16.2.1/24'
diff --git a/smoketest/scripts/cli/test_interfaces_wireguard.py b/smoketest/scripts/cli/test_interfaces_wireguard.py
index 8d3e1e158..d9a51b146 100755
--- a/smoketest/scripts/cli/test_interfaces_wireguard.py
+++ b/smoketest/scripts/cli/test_interfaces_wireguard.py
@@ -38,8 +38,8 @@ class WireGuardInterfaceTest(unittest.TestCase):
self.session.commit()
del self.session
- def test_peer(self):
- """ Create WireGuard interfaces with associated peers """
+ def test_wireguard_peer(self):
+ # Create WireGuard interfaces with associated peers
for intf in self._interfaces:
peer = 'foo-' + intf
psk = 'u2xdA70hkz0S1CG0dZlOh0aq2orwFXRIVrKo4DCvHgM='
@@ -63,9 +63,9 @@ class WireGuardInterfaceTest(unittest.TestCase):
self.assertTrue(os.path.isdir(f'/sys/class/net/{intf}'))
- def test_add_remove_peer(self):
- """ Create WireGuard interfaces with associated peers. Remove one of
- the configured peers. Bug reported as T2939 """
+ def test_wireguard_add_remove_peer(self):
+ # T2939: Create WireGuard interfaces with associated peers.
+ # Remove one of the configured peers.
interface = 'wg0'
port = '12345'
pubkey_1 = 'n1CUsmR0M2LUUsyicBd6blZICwUqqWWHbu4ifZ2/9gk='
@@ -92,7 +92,5 @@ class WireGuardInterfaceTest(unittest.TestCase):
self.session.delete(base_path + [interface, 'peer', 'PEER01'])
self.session.commit()
-
-
if __name__ == '__main__':
unittest.main(verbosity=2)
diff --git a/smoketest/scripts/cli/test_interfaces_wireless.py b/smoketest/scripts/cli/test_interfaces_wireless.py
index 111205866..9d2f4ea59 100755
--- a/smoketest/scripts/cli/test_interfaces_wireless.py
+++ b/smoketest/scripts/cli/test_interfaces_wireless.py
@@ -48,8 +48,8 @@ class WirelessInterfaceTest(BasicInterfaceTest.BaseTest):
}
self._interfaces = list(self._options)
- def test_add_single_ip_address(self):
- """ derived method to check if member interfaces are enslaved properly """
+ def test_wireless_add_single_ip_address(self):
+ # derived method to check if member interfaces are enslaved properly
super().test_add_single_ip_address()
for option, option_value in self._options.items():
@@ -62,9 +62,7 @@ class WirelessInterfaceTest(BasicInterfaceTest.BaseTest):
else:
self.assertTrue(False)
- def test_hostapd_config(self):
- """ Check if hostapd config is properly generated """
-
+ def test_wireless_hostapd_config(self):
# Only set the hostapd (access-point) options
interface = 'wlan0'
ssid = 'ssid'
@@ -140,9 +138,7 @@ class WirelessInterfaceTest(BasicInterfaceTest.BaseTest):
# Check for running process
self.assertTrue(process_named_running('hostapd'))
- def test_hostapd_wpa_config(self):
- """ Check if hostapd config is properly generated """
-
+ def test_wireless_hostapd_wpa_config(self):
# Only set the hostapd (access-point) options
interface = 'wlan0'
phy = 'phy0'
@@ -208,7 +204,7 @@ class WirelessInterfaceTest(BasicInterfaceTest.BaseTest):
# Check for running process
self.assertTrue(process_named_running('hostapd'))
- def test_access_point_bridge(self):
+ def test_wireless_access_point_bridge(self):
interface = 'wlan0'
ssid = 'VyOS-Test'
bridge = 'br42477'
diff --git a/smoketest/scripts/cli/test_nat.py b/smoketest/scripts/cli/test_nat.py
index 277b23891..7ca82f86f 100755
--- a/smoketest/scripts/cli/test_nat.py
+++ b/smoketest/scripts/cli/test_nat.py
@@ -40,8 +40,6 @@ class TestNAT(unittest.TestCase):
self.session.commit()
def test_snat(self):
- """ Test source NAT (SNAT) rules """
-
rules = ['100', '110', '120', '130', '200', '210', '220', '230']
outbound_iface_100 = 'eth0'
outbound_iface_200 = 'eth1'
@@ -92,8 +90,6 @@ class TestNAT(unittest.TestCase):
self.assertEqual(f'{address}/{mask}', network)
def test_dnat(self):
- """ Test destination NAT (DNAT) rules """
-
rules = ['100', '110', '120', '130', '200', '210', '220', '230']
inbound_iface_100 = 'eth0'
inbound_iface_200 = 'eth1'
@@ -143,8 +139,8 @@ class TestNAT(unittest.TestCase):
self.assertEqual(iface, inbound_iface_200)
- def test_validation_logic(self):
- """ T2813: Ensure translation address is specified """
+ def test_snat_required_translation_address(self):
+ # T2813: Ensure translation address is specified
rule = '5'
self.session.set(src_path + ['rule', rule, 'source', 'address', '192.0.2.0/24'])
diff --git a/smoketest/scripts/cli/test_service_bcast-relay.py b/smoketest/scripts/cli/test_service_bcast-relay.py
index b391ec5af..c28509714 100755
--- a/smoketest/scripts/cli/test_service_bcast-relay.py
+++ b/smoketest/scripts/cli/test_service_bcast-relay.py
@@ -39,8 +39,7 @@ class TestServiceBroadcastRelay(unittest.TestCase):
self.session.commit()
del self.session
- def test_service(self):
- """ Check if broadcast relay service can be configured and runs """
+ def test_broadcast_relay_service(self):
ids = range(1, 5)
for id in ids:
base = base_path + ['id', str(id)]
diff --git a/smoketest/scripts/cli/test_service_dns_dynamic.py b/smoketest/scripts/cli/test_service_dns_dynamic.py
index 4acaab319..83eede64a 100755
--- a/smoketest/scripts/cli/test_service_dns_dynamic.py
+++ b/smoketest/scripts/cli/test_service_dns_dynamic.py
@@ -45,8 +45,7 @@ class TestServiceDDNS(unittest.TestCase):
del self.session
- def test_service(self):
- """ Check individual DDNS service providers """
+ def test_dyndns_service(self):
ddns = ['interface', 'eth0', 'service']
services = ['cloudflare', 'afraid', 'dyndns', 'zoneedit']
@@ -97,8 +96,8 @@ class TestServiceDDNS(unittest.TestCase):
# Check for running process
self.assertTrue(process_named_running(PROCESS_NAME))
- def test_rfc2136(self):
- """ Check if DDNS service can be configured and runs """
+ def test_dyndns_rfc2136(self):
+ # Check if DDNS service can be configured and runs
ddns = ['interface', 'eth0', 'rfc2136', 'vyos']
ddns_key_file = '/config/auth/my.key'
diff --git a/smoketest/scripts/cli/test_service_dns_forwarding.py b/smoketest/scripts/cli/test_service_dns_forwarding.py
index d23b691aa..ada53e8dd 100755
--- a/smoketest/scripts/cli/test_service_dns_forwarding.py
+++ b/smoketest/scripts/cli/test_service_dns_forwarding.py
@@ -48,7 +48,7 @@ class TestServicePowerDNS(unittest.TestCase):
del self.session
def test_basic_forwarding(self):
- """ Check basic DNS forwarding settings """
+ # Check basic DNS forwarding settings
cache_size = '20'
negative_ttl = '120'
@@ -100,7 +100,7 @@ class TestServicePowerDNS(unittest.TestCase):
self.assertTrue(process_named_running(PROCESS_NAME))
def test_dnssec(self):
- """ DNSSEC option testing """
+ # DNSSEC option testing
for network in allow_from:
self.session.set(base_path + ['allow-from', network])
@@ -121,7 +121,7 @@ class TestServicePowerDNS(unittest.TestCase):
self.assertTrue(process_named_running(PROCESS_NAME))
def test_external_nameserver(self):
- """ Externe Domain Name Servers (DNS) addresses """
+ # Externe Domain Name Servers (DNS) addresses
for network in allow_from:
self.session.set(base_path + ['allow-from', network])
@@ -147,8 +147,6 @@ class TestServicePowerDNS(unittest.TestCase):
self.assertTrue(process_named_running(PROCESS_NAME))
def test_domain_forwarding(self):
- """ Externe Domain Name Servers (DNS) addresses """
-
for network in allow_from:
self.session.set(base_path + ['allow-from', network])
for address in listen_adress:
diff --git a/smoketest/scripts/cli/test_service_pppoe-server.py b/smoketest/scripts/cli/test_service_pppoe-server.py
index 6bb301c94..0957521a3 100755
--- a/smoketest/scripts/cli/test_service_pppoe-server.py
+++ b/smoketest/scripts/cli/test_service_pppoe-server.py
@@ -73,8 +73,8 @@ class TestServicePPPoEServer(BasicAccelPPPTest.BaseTest):
super().basic_config()
- def test_ppp_options(self):
- """ Test configuration of local authentication for PPPoE server """
+ def test_pppoe_server_ppp_options(self):
+ # Test configuration of local authentication for PPPoE server
self.basic_config()
# other settings
@@ -116,8 +116,8 @@ class TestServicePPPoEServer(BasicAccelPPPTest.BaseTest):
# Check for running process
self.assertTrue(process_named_running(self._process_name))
- def test_authentication_protocols(self):
- """ Test configuration of local authentication for PPPoE server """
+ def test_pppoe_server_authentication_protocols(self):
+ # Test configuration of local authentication for PPPoE server
self.basic_config()
# explicitly test mschap-v2 - no special reason
@@ -135,8 +135,8 @@ class TestServicePPPoEServer(BasicAccelPPPTest.BaseTest):
# Check for running process
self.assertTrue(process_named_running(self._process_name))
- def test_client_ip_pool(self):
- """ Test configuration of IPv6 client pools """
+ def test_pppoe_server_client_ip_pool(self):
+ # Test configuration of IPv6 client pools
self.basic_config()
subnet = '172.18.0.0/24'
@@ -164,8 +164,8 @@ class TestServicePPPoEServer(BasicAccelPPPTest.BaseTest):
self.assertTrue(process_named_running(self._process_name))
- def test_client_ipv6_pool(self):
- """ Test configuration of IPv6 client pools """
+ def test_pppoe_server_client_ipv6_pool(self):
+ # Test configuration of IPv6 client pools
self.basic_config()
# Enable IPv6
@@ -207,7 +207,7 @@ class TestServicePPPoEServer(BasicAccelPPPTest.BaseTest):
self.assertTrue(process_named_running(self._process_name))
- def test_authentication_radius(self):
+ def test_accel_radius_authentication(self):
radius_called_sid = 'ifname:mac'
radius_acct_interim_jitter = '9'
@@ -215,7 +215,7 @@ class TestServicePPPoEServer(BasicAccelPPPTest.BaseTest):
self.set(['authentication', 'radius', 'acct-interim-jitter', radius_acct_interim_jitter])
# run common tests
- super().test_authentication_radius()
+ super().test_accel_radius_authentication()
# Validate configuration values
conf = ConfigParser(allow_no_value=True, delimiters='=')
diff --git a/smoketest/scripts/cli/test_service_snmp.py b/smoketest/scripts/cli/test_service_snmp.py
index 2332ab024..81045d0b4 100755
--- a/smoketest/scripts/cli/test_service_snmp.py
+++ b/smoketest/scripts/cli/test_service_snmp.py
@@ -45,8 +45,8 @@ class TestSNMPService(unittest.TestCase):
def tearDown(self):
del self.session
- def test_snmp(self):
- """ Check if SNMP can be configured and service runs """
+ def test_snmp_basic(self):
+ # Check if SNMP can be configured and service runs
clients = ['192.0.2.1', '2001:db8::1']
networks = ['192.0.2.128/25', '2001:db8:babe::/48']
listen = ['127.0.0.1', '::1']
@@ -85,7 +85,8 @@ class TestSNMPService(unittest.TestCase):
def test_snmpv3_sha(self):
- """ Check if SNMPv3 can be configured with SHA authentication and service runs"""
+ # Check if SNMPv3 can be configured with SHA authentication
+ # and service runs
self.session.set(base_path + ['v3', 'engineid', '000000000000000000000002'])
self.session.set(base_path + ['v3', 'group', 'default', 'mode', 'ro'])
@@ -119,7 +120,8 @@ class TestSNMPService(unittest.TestCase):
self.assertTrue(process_named_running(PROCESS_NAME))
def test_snmpv3_md5(self):
- """ Check if SNMPv3 can be configured with MD5 authentication and service runs"""
+ # Check if SNMPv3 can be configured with MD5 authentication
+ # and service runs
self.session.set(base_path + ['v3', 'engineid', '000000000000000000000002'])
self.session.set(base_path + ['v3', 'group', 'default', 'mode', 'ro'])
diff --git a/smoketest/scripts/cli/test_service_ssh.py b/smoketest/scripts/cli/test_service_ssh.py
index 308eb51fa..0bb907c3a 100755
--- a/smoketest/scripts/cli/test_service_ssh.py
+++ b/smoketest/scripts/cli/test_service_ssh.py
@@ -53,8 +53,8 @@ class TestServiceSSH(unittest.TestCase):
del self.session
def test_ssh_default(self):
- """ Check if SSH service runs with default settings - used for checking
- behavior of <defaultValue> in XML definition """
+ # Check if SSH service runs with default settings - used for checking
+ # behavior of <defaultValue> in XML definition
self.session.set(base_path)
# commit changes
@@ -67,8 +67,8 @@ class TestServiceSSH(unittest.TestCase):
# Check for running process
self.assertTrue(process_named_running(PROCESS_NAME))
- def test_ssh_single(self):
- """ Check if SSH service can be configured and runs """
+ def test_ssh_single_listen_address(self):
+ # Check if SSH service can be configured and runs
self.session.set(base_path + ['port', '1234'])
self.session.set(base_path + ['disable-host-validation'])
self.session.set(base_path + ['disable-password-authentication'])
@@ -106,9 +106,9 @@ class TestServiceSSH(unittest.TestCase):
# Check for running process
self.assertTrue(process_named_running(PROCESS_NAME))
- def test_ssh_multi(self):
- """ Check if SSH service can be configured and runs with multiple
- listen ports and listen-addresses """
+ def test_ssh_multiple_listen_addresses(self):
+ # Check if SSH service can be configured and runs with multiple
+ # listen ports and listen-addresses
ports = ['22', '2222']
for port in ports:
self.session.set(base_path + ['port', port])
@@ -134,7 +134,7 @@ class TestServiceSSH(unittest.TestCase):
self.assertTrue(process_named_running(PROCESS_NAME))
def test_ssh_vrf(self):
- """ Check if SSH service can be bound to given VRF """
+ # Check if SSH service can be bound to given VRF
port = '22'
self.session.set(base_path + ['port', port])
self.session.set(base_path + ['vrf', vrf])
diff --git a/smoketest/scripts/cli/test_service_webproxy.py b/smoketest/scripts/cli/test_service_webproxy.py
index 6348daa74..3db2daa8f 100755
--- a/smoketest/scripts/cli/test_service_webproxy.py
+++ b/smoketest/scripts/cli/test_service_webproxy.py
@@ -204,7 +204,7 @@ class TestServiceWebProxy(unittest.TestCase):
self.assertTrue(process_named_running(PROCESS_NAME))
def test_05_basic_squidguard(self):
- """ Create very basic local SquidGuard blacklist and verify its contents" """
+ # Create very basic local SquidGuard blacklist and verify its contents
sg_db_dir = '/opt/vyatta/etc/config/url-filtering/squidguard/db'
default_cache = '100'
diff --git a/smoketest/scripts/cli/test_system_ip.py b/smoketest/scripts/cli/test_system_ip.py
index 982d7bc0a..8fc18ba88 100755
--- a/smoketest/scripts/cli/test_system_ip.py
+++ b/smoketest/scripts/cli/test_system_ip.py
@@ -32,8 +32,8 @@ class TestSystemIP(unittest.TestCase):
del self.session
def test_system_ip_forwarding(self):
- """ Test if IPv4 forwarding can be disabled globally, default is '1'
- which means forwearding enabled """
+ # Test if IPv4 forwarding can be disabled globally, default is '1'
+ # which means forwearding enabled
all_forwarding = '/proc/sys/net/ipv4/conf/all/forwarding'
self.assertEqual(read_file(all_forwarding), '1')
@@ -43,7 +43,7 @@ class TestSystemIP(unittest.TestCase):
self.assertEqual(read_file(all_forwarding), '0')
def test_system_ip_multipath(self):
- """ test IPv4 multipathing options, options default to off -> '0' """
+ # Test IPv4 multipathing options, options default to off -> '0'
use_neigh = '/proc/sys/net/ipv4/fib_multipath_use_neigh'
hash_policy = '/proc/sys/net/ipv4/fib_multipath_hash_policy'
@@ -58,7 +58,8 @@ class TestSystemIP(unittest.TestCase):
self.assertEqual(read_file(hash_policy), '1')
def test_system_ip_arp_table_size(self):
- """ Maximum number of entries to keep in the ARP cache, the default is 8k """
+ # Maximum number of entries to keep in the ARP cache, the
+ # default is 8k
gc_thresh3 = '/proc/sys/net/ipv4/neigh/default/gc_thresh3'
gc_thresh2 = '/proc/sys/net/ipv4/neigh/default/gc_thresh2'
diff --git a/smoketest/scripts/cli/test_system_login.py b/smoketest/scripts/cli/test_system_login.py
index eb749b164..6188cf38b 100755
--- a/smoketest/scripts/cli/test_system_login.py
+++ b/smoketest/scripts/cli/test_system_login.py
@@ -43,7 +43,7 @@ class TestSystemLogin(unittest.TestCase):
del self.session
def test_local_user(self):
- """ Check if user can be created and we can SSH to localhost """
+ # Check if user can be created and we can SSH to localhost
self.session.set(['service', 'ssh', 'port', '22'])
for user in users:
@@ -69,7 +69,7 @@ class TestSystemLogin(unittest.TestCase):
self.assertTrue(len(stdout) > 40)
def test_radius_kernel_features(self):
- """ T2886: RADIUS requires some Kernel options to be present """
+ # T2886: RADIUS requires some Kernel options to be present
kernel = platform.release()
kernel_config = read_file(f'/boot/config-{kernel}')
@@ -83,7 +83,7 @@ class TestSystemLogin(unittest.TestCase):
self.assertIn(f'{option}=y', kernel_config)
def test_radius_config(self):
- """ Verify generated RADIUS configuration files """
+ # Verify generated RADIUS configuration files
radius_key = 'VyOSsecretVyOS'
radius_server = '172.16.100.10'
diff --git a/smoketest/scripts/cli/test_system_nameserver.py b/smoketest/scripts/cli/test_system_nameserver.py
index d86c2b424..5610c90c7 100755
--- a/smoketest/scripts/cli/test_system_nameserver.py
+++ b/smoketest/scripts/cli/test_system_nameserver.py
@@ -41,8 +41,8 @@ class TestSystemNameServer(unittest.TestCase):
del self.session
- def test_add_server(self):
- """ Check if server is added to resolv.conf """
+ def test_nameserver_add(self):
+ # Check if server is added to resolv.conf
for s in test_servers:
self.session.set(base_path + [s])
self.session.commit()
@@ -51,8 +51,8 @@ class TestSystemNameServer(unittest.TestCase):
for s in servers:
self.assertTrue(s in servers)
- def test_delete_server(self):
- """ Test if a deleted server disappears from resolv.conf """
+ def test_nameserver_delete(self):
+ # Test if a deleted server disappears from resolv.conf
for s in test_servers:
self.session.delete(base_path + [s])
self.session.commit()
diff --git a/smoketest/scripts/cli/test_system_ntp.py b/smoketest/scripts/cli/test_system_ntp.py
index 503c789d9..7d1bc144f 100755
--- a/smoketest/scripts/cli/test_system_ntp.py
+++ b/smoketest/scripts/cli/test_system_ntp.py
@@ -48,7 +48,7 @@ class TestSystemNTP(unittest.TestCase):
del self.session
def test_ntp_options(self):
- """ Test basic NTP support with multiple servers and their options """
+ # Test basic NTP support with multiple servers and their options
servers = ['192.0.2.1', '192.0.2.2']
options = ['noselect', 'preempt', 'prefer']
ntp_pool = 'pool.vyos.io'
@@ -76,7 +76,7 @@ class TestSystemNTP(unittest.TestCase):
self.assertTrue(process_named_running(PROCESS_NAME))
def test_ntp_clients(self):
- """ Test the allowed-networks statement """
+ # Test the allowed-networks statement
networks = ['192.0.2.0/24', '2001:db8:1000::/64']
for network in networks:
self.session.set(base_path + ['allow-clients', 'address', network])
diff --git a/smoketest/scripts/system/test_kernel_options.py b/smoketest/scripts/system/test_kernel_options.py
index 08c0749c1..4d9cbacbe 100755
--- a/smoketest/scripts/system/test_kernel_options.py
+++ b/smoketest/scripts/system/test_kernel_options.py
@@ -29,13 +29,13 @@ class TestKernelModules(unittest.TestCase):
available in the Kernel that is run. """
def test_bond_interface(self):
- """ The bond/lacp interface must be enabled in the OS Kernel """
+ # The bond/lacp interface must be enabled in the OS Kernel
for option in ['CONFIG_BONDING']:
tmp = re.findall(f'{option}=(y|m)', config)
self.assertTrue(tmp)
def test_bridge_interface(self):
- """ The bridge interface must be enabled in the OS Kernel """
+ # The bridge interface must be enabled in the OS Kernel
for option in ['CONFIG_BRIDGE',
'CONFIG_BRIDGE_IGMP_SNOOPING',
'CONFIG_BRIDGE_VLAN_FILTERING']:
@@ -43,7 +43,7 @@ class TestKernelModules(unittest.TestCase):
self.assertTrue(tmp)
def test_qemu_support(self):
- """ The bond/lacp interface must be enabled in the OS Kernel """
+ # The bond/lacp interface must be enabled in the OS Kernel
for option in ['CONFIG_VIRTIO_BLK', 'CONFIG_SCSI_VIRTIO',
'CONFIG_VIRTIO_NET', 'CONFIG_VIRTIO_CONSOLE',
'CONFIG_VIRTIO', 'CONFIG_VIRTIO_PCI',
@@ -53,7 +53,7 @@ class TestKernelModules(unittest.TestCase):
self.assertTrue(tmp)
def test_vmware_support(self):
- """ The bond/lacp interface must be enabled in the OS Kernel """
+ # The bond/lacp interface must be enabled in the OS Kernel
for option in ['CONFIG_VMXNET3']:
tmp = re.findall(f'{option}=(y|m)', config)
self.assertTrue(tmp)