mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 13:45:38 +00:00
8a743a598b
Currently we only append a newline to 'actual' if 'expected' (as loaded from file) already ends in a newline, but that results in inconsistent behavior. For example, some of the test files used by virhostcputest are newline-terminated and some aren't. If we were to remove existing newlines from those files or add them where they aren't present, the test would still pass, and even using VIR_TEST_REGENERATE_OUTPUT=1 wouldn't change them back. Make things consistent by ensuring that 'actual' is always newline-terminated. The only exception is when 'actual' is completely empty: in that case, we want the file to be actually empty, not contain a single empty line. query-jobs-empty.result in qemumonitorjsondata/ is an example of this being used. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com> |
||
|---|---|---|
| .. | ||
| disk-cdrom-network.args.disk0 | ||
| disk-cdrom-network.args.disk1 | ||
| disk-cdrom-network.args.disk1.pipe.778 | ||
| disk-cdrom-network.args.disk2 | ||
| disk-cdrom-network.args.disk2.pipe.780 | ||
| disk-network-http.args.disk0 | ||
| disk-network-http.args.disk1 | ||
| disk-network-http.args.disk2 | ||
| disk-network-http.args.disk2.pipe.778 | ||
| disk-network-http.args.disk3 | ||
| disk-network-http.args.disk3.pipe.780 | ||
| disk-network-source-curl-nbdkit-backing.args.disk0 | ||
| disk-network-source-curl-nbdkit-backing.args.disk0.pipe.778 | ||
| disk-network-source-curl.args.disk0 | ||
| disk-network-source-curl.args.disk0.pipe.778 | ||
| disk-network-source-curl.args.disk1 | ||
| disk-network-source-curl.args.disk1.pipe.780 | ||
| disk-network-source-curl.args.disk1.pipe.782 | ||
| disk-network-source-curl.args.disk2 | ||
| disk-network-source-curl.args.disk2.pipe.784 | ||
| disk-network-source-curl.args.disk3 | ||
| disk-network-source-curl.args.disk4 | ||
| disk-network-ssh-key.args.disk0 | ||
| disk-network-ssh-key.args.disk1 | ||
| disk-network-ssh-password.args.disk0 | ||
| disk-network-ssh-password.args.disk0.pipe.778 | ||
| disk-network-ssh.args.disk0 | ||