From 6b9518a0e84b01b1cfa07d0f3b18e7764ac25085 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 30 Jun 2019 02:28:42 +0900 Subject: [PATCH] test-network: add test for Property= in [Match] section --- .../conf/13-not-match-udev-property.network | 6 ++++++ test/test-network/conf/14-match-udev-property.network | 7 +++++++ test/test-network/systemd-networkd-tests.py | 11 +++++++++++ 3 files changed, 24 insertions(+) create mode 100644 test/test-network/conf/13-not-match-udev-property.network create mode 100644 test/test-network/conf/14-match-udev-property.network diff --git a/test/test-network/conf/13-not-match-udev-property.network b/test/test-network/conf/13-not-match-udev-property.network new file mode 100644 index 0000000000..f0a530e9db --- /dev/null +++ b/test/test-network/conf/13-not-match-udev-property.network @@ -0,0 +1,6 @@ +[Match] +Name=dummy98 +Property=INTERFACE=hoge + +[Network] +IPv6AcceptRA=false diff --git a/test/test-network/conf/14-match-udev-property.network b/test/test-network/conf/14-match-udev-property.network new file mode 100644 index 0000000000..b632af166a --- /dev/null +++ b/test/test-network/conf/14-match-udev-property.network @@ -0,0 +1,7 @@ +[Match] +Name=dummy98 +Property=INTERFACE=dummy98 + +[Network] +IPv6AcceptRA=false +Address=10.1.2.3/16 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 9c274c128d..75863c3910 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -463,6 +463,8 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): '11-dummy.netdev', '11-dummy.network', '12-dummy.netdev', + '13-not-match-udev-property.network', + '14-match-udev-property.network', '15-name-conflict-test.netdev', '21-macvlan.netdev', '21-macvtap.netdev', @@ -578,6 +580,15 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): print(output) self.assertRegex(output, '00:50:56:c0:00:28') + def test_match_udev_property(self): + copy_unit_to_networkd_unit_path('12-dummy.netdev', '13-not-match-udev-property.network', '14-match-udev-property.network') + start_networkd() + wait_online(['dummy98:routable']) + + output = check_output('networkctl status dummy98') + print(output) + self.assertRegex(output, 'Network File: /run/systemd/network/14-match-udev-property') + def test_wait_online_any(self): copy_unit_to_networkd_unit_path('25-bridge.netdev', '25-bridge.network', '11-dummy.netdev', '11-dummy.network') start_networkd()