[Pkg-libvirt-commits] [libguestfs] 56/66: v2v: tests: Don't care about the <model> XML when testing network and bridge mapping.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.27.54-1
in repository libguestfs.

commit e1407b36906d978a01c2e3dc19d7b4e1a124cc9f
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Sep 24 18:29:27 2014 +0100

    v2v: tests: Don't care about the <model> XML when testing network and bridge mapping.
---
 v2v/test-v2v-networks-and-bridges-expected.xml | 7 -------
 v2v/test-v2v-networks-and-bridges.sh           | 5 ++++-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/v2v/test-v2v-networks-and-bridges-expected.xml b/v2v/test-v2v-networks-and-bridges-expected.xml
index 80ac21e..fef9979 100644
--- a/v2v/test-v2v-networks-and-bridges-expected.xml
+++ b/v2v/test-v2v-networks-and-bridges-expected.xml
@@ -1,41 +1,34 @@
     <interface type='bridge'>
       <!-- bridge mapped from "VM Network" to "bridge1" -->
       <source bridge='bridge1'/>
-      <model type='rtl8139'/>
     </interface>
     <interface type='bridge'>
       <!-- bridge mapped from "bob" to "bridge2" -->
       <source bridge='bridge2'/>
-      <model type='rtl8139'/>
       <mac address='52:54:00:01:02:03'/>
     </interface>
     <interface type='network'>
       <!-- network mapped from "default" to "network1" -->
       <source network='network1'/>
-      <model type='rtl8139'/>
       <mac address='52:54:00:01:02:04'/>
     </interface>
     <interface type='network'>
       <!-- network mapped from "john" to "network2" -->
       <source network='network2'/>
-      <model type='rtl8139'/>
       <mac address='52:54:00:01:02:05'/>
     </interface>
     <interface type='network'>
       <!-- network mapped from "paul" to "network3" -->
       <source network='network3'/>
-      <model type='rtl8139'/>
       <mac address='52:54:00:01:02:06'/>
     </interface>
     <interface type='network'>
       <!-- network mapped from "george" to "network4" -->
       <source network='network4'/>
-      <model type='rtl8139'/>
       <mac address='52:54:00:01:02:07'/>
     </interface>
     <interface type='network'>
       <!-- network mapped from "ringo" to "network4" -->
       <source network='network4'/>
-      <model type='rtl8139'/>
       <mac address='52:54:00:01:02:08'/>
     </interface>
diff --git a/v2v/test-v2v-networks-and-bridges.sh b/v2v/test-v2v-networks-and-bridges.sh
index 5974dcb..178be9b 100755
--- a/v2v/test-v2v-networks-and-bridges.sh
+++ b/v2v/test-v2v-networks-and-bridges.sh
@@ -66,7 +66,10 @@ $VG virt-v2v --debug-gc \
 test -f $d/windows.xml
 
 # Extract just the network interfaces from the XML.
-sed -n '/interface/,/\/interface/p' $d/windows.xml > $d/networks
+# Delete the network model XML because that can change depending
+# on whether virtio-win is installed or not.
+sed -n '/interface/,/\/interface/p' $d/windows.xml |
+  grep -v 'model type=' > $d/networks
 
 # Test that the output has mapped the networks and bridges correctly.
 diff -ur test-v2v-networks-and-bridges-expected.xml $d/networks

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git