[libvirt] [PATCH v4 2/5] Network: Add regression tests for the command-line arguments

[Michal Novotny]

On 06/14/2011 03:26 PM, Daniel P. Berrange wrote:
> On Mon, Jun 13, 2011 at 06:55:03PM +0200, Michal Novotny wrote:
>> diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv
>> new file mode 100644
>> index 0000000..dce6034
>> --- /dev/null
>> +++ b/tests/networkxml2argvdata/isolated-network.argv
>> @@ -0,0 +1 @@
>> +/usr/sbin/dnsmasq --strict-order --bind-interfaces --pid-file=(null) --conf-file= --except-interface lo --dhcp-option=3 --listen-address 192.168.152.1 --dhcp-range 192.168.152.2,192.168.152.254 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 --dhcp-no-override
>> \ No newline at end of file
>> diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv
>> new file mode 100644
>> index 0000000..96fde34
>> --- /dev/null
>> +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv
>> @@ -0,0 +1 @@
>> +/usr/sbin/dnsmasq --strict-order --bind-interfaces --pid-file=(null) --conf-file= --except-interface lo --txt-record=example,example value --listen-address 192.168.122.1 --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 --dhcp-range 192.168.122.2,192.168.122.254 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases --dhcp-lease-max=253 --dhcp-no-override --dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile
>> \ No newline at end of file
>> diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv
>> new file mode 100644
>> index 0000000..ccffa67
>> --- /dev/null
>> +++ b/tests/networkxml2argvdata/nat-network.argv
>> @@ -0,0 +1 @@
>> +/usr/sbin/dnsmasq --strict-order --bind-interfaces --pid-file=(null) --conf-file= --except-interface lo --listen-address 192.168.122.1 --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 --dhcp-range 192.168.122.2,192.168.122.254 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases --dhcp-lease-max=253 --dhcp-no-override --dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile
>> \ No newline at end of file
>> diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv
>> new file mode 100644
>> index 0000000..565c41b
>> --- /dev/null
>> +++ b/tests/networkxml2argvdata/netboot-network.argv
>> @@ -0,0 +1 @@
>> +/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com --pid-file=(null) --conf-file= --except-interface lo --listen-address 192.168.122.1 --dhcp-range 192.168.122.2,192.168.122.254 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases --dhcp-lease-max=253 --dhcp-no-override --enable-tftp --tftp-root /var/lib/tftproot --dhcp-boot pxeboot.img
>> \ No newline at end of file
>> diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv
>> new file mode 100644
>> index 0000000..019367d
>> --- /dev/null
>> +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv
>> @@ -0,0 +1 @@
>> +/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com --pid-file=(null) --conf-file= --except-interface lo --listen-address 192.168.122.1 --dhcp-range 192.168.122.2,192.168.122.254 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases --dhcp-lease-max=253 --dhcp-no-override --dhcp-boot pxeboot.img,,10.20.30.40
>> \ No newline at end of file
>> diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv
>> new file mode 100644
>> index 0000000..2b51d90
>> --- /dev/null
>> +++ b/tests/networkxml2argvdata/routed-network.argv
>> @@ -0,0 +1 @@
>> +/usr/sbin/dnsmasq --strict-order --bind-interfaces --pid-file=(null) --conf-file= --except-interface lo --listen-address 192.168.122.1
>> \ No newline at end of file
>
> The '--pid-file=(null)' surely cannot be right for any of these.
>
> Also, as we did with the .args files in qemuxml2argvdata/ we really
> want to split these long lines
>
> Regards,
> Daniel
Well, the --pid-file is always set in real world scenario and since I'm
not generating the pid file for the tests I'm passing NULL there so
that's why there's --pid-file=(null)...

What do you mean by splitting those lines? To split to:

/usr/sbin/dnsmasq
--strict-order
--bind-interfaces
--pid-file=(null)
--conf-file=
--except-interface lo
--listen-address 192.168.122.1

instead of:

/usr/sbin/dnsmasq --strict-order --bind-interfaces --pid-file=(null) --conf-file= --except-interface lo --listen-address 192.168.122.1

?

Thanks,
Michal

-- 
Michal Novotny <minovotn at redhat.com>, RHCE
Virtualization Team (xen userspace), Red Hat