diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-06-30 15:44:22 +0200 |
|---|---|---|
| committer | Evgeny Vereshchagin <evvers@ya.ru> | 2016-06-30 16:44:22 +0300 |
| commit | 30b42a9a36727ac6a5201d51b6d9cd9c788a559a (patch) | |
| tree | 45b7ec9a1d77c5417a35a3aa42b59c2cdd704412 /test/parent.slice | |
| parent | 2e0d8df13b1c1deda7b5769accae9e6cd5bf5966 (diff) | |
test: check resolved generated resolv.conf in networkd-test (#3628)
* test: check resolved generated resolv.conf in networkd-test
Directly verify the contents of /run/systemd/resolve/resolv.conf instead of
/etc/resolv.conf. The latter might be a plain file or a symlink to something
else (like Debian's resolvconf output), and in these cases we cannot make
strong assumptions about the contents.
Drop the "/etc/resolv.conf is a symlink" conditions and the "resolv.conf can
have at most three nameservers" alternatives, as we know that resolved always
adds all nameservers.
Explicitly start resolved at the start of a test to ensure that it is running.
* test: get along with existing system search domains in resolv.conf
The previous change has uncovered a bug in the tests: Existing search domains
can exist in resolv.conf which test_search_domains{,_too_long} didn't take into account.
As existing domains take some of the "max 6 domains" and "max 255 chars" limit,
don't expect that the last items from our test data actually appears in the
output, just the first few.
Diffstat (limited to 'test/parent.slice')
0 files changed, 0 insertions, 0 deletions