[libvirt] [PATCH tck] 100-ping-still-working.t: Replace vnet0 with mac address

Using a statically defined vnet0 may fail if multiple VMs are running on the test machine. Switch to mac address, but replace '00' with '0' to match the output of ebtables. --- scripts/nwfilter/100-ping-still-working.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nwfilter/100-ping-still-working.t b/scripts/nwfilter/100-ping-still-working.t index 1105d70..6c931ff 100644 --- a/scripts/nwfilter/100-ping-still-working.t +++ b/scripts/nwfilter/100-ping-still-working.t @@ -67,8 +67,8 @@ diag "ip is $guestip"; my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; -# fixme to include mac adress -ok($ebtable =~ "vnet0", "check ebtables entry"); +$mac =~ s/00/0/g; +ok($ebtable =~ "$mac", "check ebtables entry"); # ping guest1 my $ping = `ping -c 10 $guestip`; -- 1.8.4.5

On Friday, March 28, 2014 11:28:19 AM Mike Latimer wrote:
Using a statically defined vnet0 may fail if multiple VMs are running on the test machine. Switch to mac address, but replace '00' with '0' to match the output of ebtables.
--- scripts/nwfilter/100-ping-still-working.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
I just realized Daniel's patch already fixes this for other tests (in almost the same way), so it would be better to just update his patch to do this as well. I'll reply to the specific patch next. -Mike
participants (1)
-
Mike Latimer