diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-07-16 03:12:35 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-07-16 23:59:12 +0200 |
| commit | 217246a990cc34155f02fcecce1df95ca2e1abed (patch) | |
| tree | 443cb31701a802414dffa4da8d4d5574a8e95605 | |
| parent | test-network: stop firewalld in setUpModule() (diff) | |
| download | systemd-217246a990cc34155f02fcecce1df95ca2e1abed.tar.xz systemd-217246a990cc34155f02fcecce1df95ca2e1abed.zip | |
test-network: drop warn_about_firewalld() as it is not necessary any more
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 67c14f8b2d..7d059f47e7 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -267,13 +267,7 @@ def remove_unit_from_networkd_path(units): if (os.path.exists(os.path.join(network_unit_file_path, unit + '.d'))): shutil.rmtree(os.path.join(network_unit_file_path, unit + '.d')) -def warn_about_firewalld(): - rc = call('systemctl -q is-active firewalld.service') - if rc == 0: - print('\nWARNING: firewalld.service is active. The test may fail.') - def start_dnsmasq(additional_options='', ipv4_range='192.168.5.10,192.168.5.200', ipv6_range='2600::10,2600::20', lease_time='1h'): - warn_about_firewalld() dnsmasq_command = f'dnsmasq -8 /var/run/networkd-ci/test-dnsmasq-log-file --log-queries=extra --log-dhcp --pid-file=/var/run/networkd-ci/test-test-dnsmasq.pid --conf-file=/dev/null --interface=veth-peer --enable-ra --dhcp-range={ipv6_range},{lease_time} --dhcp-range={ipv4_range},{lease_time} -R --dhcp-leasefile=/var/run/networkd-ci/lease --dhcp-option=26,1492 --dhcp-option=option:router,192.168.5.1 --dhcp-option=33,192.168.5.4,192.168.5.5 --port=0 ' + additional_options check_output(dnsmasq_command) @@ -2265,7 +2259,6 @@ class NetworkdRATests(unittest.TestCase, Utilities): stop_networkd(show_logs=True) def test_ipv6_prefix_delegation(self): - warn_about_firewalld() copy_unit_to_networkd_unit_path('25-veth.netdev', 'ipv6-prefix.network', 'ipv6-prefix-veth.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:degraded']) @@ -2294,7 +2287,6 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): stop_networkd(show_logs=True) def test_dhcp_server(self): - warn_about_firewalld() copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-client.network', 'dhcp-server.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:routable']) @@ -2307,7 +2299,6 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): self.assertRegex(output, 'NTP: 192.168.5.1') def test_emit_router_timezone(self): - warn_about_firewalld() copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-client-timezone-router.network', 'dhcp-server-timezone-router.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:routable']) |