diff --git a/tests/generator/test_args.py b/tests/generator/test_args.py index bb79c40d0..b8a7f959a 100644 --- a/tests/generator/test_args.py +++ b/tests/generator/test_args.py @@ -207,12 +207,13 @@ def test_systemd_generator(self): # eth99 does not exist on the system, so will not be listed self.assertEqual(f.read(), '''[Unit] ConditionPathIsSymbolicLink=/run/systemd/generator/network-online.target.wants/systemd-networkd-wait-online.service +After=systemd-resolved.service [Service] ExecStart= ExecStart=/lib/systemd/systemd-networkd-wait-online -i eth99.43:carrier -i lo:carrier \ -i eth99.42:carrier -i eth99.44:degraded -i bond0:degraded -ExecStart=/lib/systemd/systemd-networkd-wait-online --any -o routable -i eth99.43 -i eth99.45 -i bond0\n''') +ExecStart=/lib/systemd/systemd-networkd-wait-online --any --dns -o routable -i eth99.43 -i eth99.45 -i bond0\n''') # should be a no-op the second time while the stamp exists out = subprocess.check_output([generator, '--root-dir', self.workdir.name, outdir, outdir, outdir], @@ -323,11 +324,12 @@ def test_systemd_wait_online_only_routable(self): with open(override, 'r') as f: self.assertEqual(f.read(), '''[Unit] ConditionPathIsSymbolicLink=/run/systemd/generator/network-online.target.wants/systemd-networkd-wait-online.service +After=systemd-resolved.service [Service] ExecStart= ExecStart=/lib/systemd/systemd-networkd-wait-online -i br0:degraded -ExecStart=/lib/systemd/systemd-networkd-wait-online --any -o routable -i br0 +ExecStart=/lib/systemd/systemd-networkd-wait-online --any --dns -o routable -i br0 ''') def test_systemd_generator_noconf(self): @@ -395,11 +397,12 @@ def test_systemd_generator_escaping(self): # eth99 does not exist on the system, so will not be listed self.assertEqual(f.read(), '''[Unit] ConditionPathIsSymbolicLink=/run/systemd/generator/network-online.target.wants/systemd-networkd-wait-online.service +After=systemd-resolved.service [Service] ExecStart= ExecStart=/lib/systemd/systemd-networkd-wait-online -i a \\; b\\t; c\\t; d \\n 123 \\; echo :degraded -ExecStart=/lib/systemd/systemd-networkd-wait-online --any -o routable -i a \\; b\\t; c\\t; d \\n 123 \\; echo \n''') +ExecStart=/lib/systemd/systemd-networkd-wait-online --any --dns -o routable -i a \\; b\\t; c\\t; d \\n 123 \\; echo \n''') # should be a no-op the second time while the stamp exists out = subprocess.check_output([generator, '--root-dir', self.workdir.name, outdir, outdir, outdir],