From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 26 Nov 2018 06:01:01 +0000 (+0900)
Subject: test-network: add tests for dropin .conf files
X-Git-Tag: v240~217^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=013c8dc94d9f8e3661d928bb90ba3e7f1b74fdfc;p=thirdparty%2Fsystemd.git

test-network: add tests for dropin .conf files
---

diff --git a/test/test-network/conf/21-vlan.netdev b/test/test-network/conf/21-vlan.netdev
index fe9801c8a26..af39404b5f2 100644
--- a/test/test-network/conf/21-vlan.netdev
+++ b/test/test-network/conf/21-vlan.netdev
@@ -1,10 +1,3 @@
 [NetDev]
 Name=vlan99
 Kind=vlan
-
-[VLAN]
-Id=99
-GVRP=true
-MVRP=true
-LooseBinding=true
-ReorderHeader=true
diff --git a/test/test-network/conf/21-vlan.netdev.d/override.conf b/test/test-network/conf/21-vlan.netdev.d/override.conf
new file mode 100644
index 00000000000..cd61be53101
--- /dev/null
+++ b/test/test-network/conf/21-vlan.netdev.d/override.conf
@@ -0,0 +1,6 @@
+[VLAN]
+Id=99
+GVRP=true
+MVRP=true
+LooseBinding=true
+ReorderHeader=true
diff --git a/test/test-network/conf/21-vlan.network b/test/test-network/conf/21-vlan.network
index a4fa1decde7..afe1debe081 100644
--- a/test/test-network/conf/21-vlan.network
+++ b/test/test-network/conf/21-vlan.network
@@ -1,5 +1,2 @@
 [Match]
 Name=test1
-
-[Network]
-VLAN=vlan99
diff --git a/test/test-network/conf/21-vlan.network.d/override.conf b/test/test-network/conf/21-vlan.network.d/override.conf
new file mode 100644
index 00000000000..363fc90d7be
--- /dev/null
+++ b/test/test-network/conf/21-vlan.network.d/override.conf
@@ -0,0 +1,2 @@
+[Network]
+VLAN=vlan99
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index e1ff2dad237..11b4aa12734 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -74,11 +74,15 @@ class Utilities():
     def copy_unit_to_networkd_unit_path(self, *units):
         for unit in units:
             shutil.copy(os.path.join(networkd_ci_path, unit), network_unit_file_path)
+            if (os.path.exists(os.path.join(networkd_ci_path, unit + '.d'))):
+                copytree(os.path.join(networkd_ci_path, unit + '.d'), os.path.join(network_unit_file_path, unit + '.d'))
 
     def remove_unit_from_networkd_path(self, units):
         for unit in units:
             if (os.path.exists(os.path.join(network_unit_file_path, unit))):
                 os.remove(os.path.join(network_unit_file_path, unit))
+                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 start_dnsmasq(self):
         subprocess.check_call('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=2600::10,2600::20 --dhcp-range=192.168.5.10,192.168.5.200 -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', shell=True)