aboutsummaryrefslogtreecommitdiffstats
path: root/tools/xm-test
diff options
context:
space:
mode:
authorKeir Fraser <keir@xensource.com>2007-10-02 09:26:18 +0100
committerKeir Fraser <keir@xensource.com>2007-10-02 09:26:18 +0100
commitc624ac637e414194d4ca147049eb6588581dc2be (patch)
tree7d329c596c78534dfb68b57c90b9db71e1b2bb5a /tools/xm-test
parent260a9deca202e75636cf2390e3f5fc16c57ec0e6 (diff)
downloadxen-c624ac637e414194d4ca147049eb6588581dc2be.tar.gz
xen-c624ac637e414194d4ca147049eb6588581dc2be.tar.bz2
xen-c624ac637e414194d4ca147049eb6588581dc2be.zip
xm-test: Fix bugzilla #1051.
This is a patch to fix xm-test's network errors http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1051 From: Lukasz Szymanski <Lukasz.Szymanski@unisys.com> Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'tools/xm-test')
-rw-r--r--tools/xm-test/configure.ac4
-rw-r--r--tools/xm-test/lib/XmTestLib/NetConfig.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac
index 14aee142b7..bbc639bdb0 100644
--- a/tools/xm-test/configure.ac
+++ b/tools/xm-test/configure.ac
@@ -85,9 +85,9 @@ AC_SUBST(NET_IP_RANGE)
AC_SUBST(NETWORK_ADDRESS)
AC_SUBST(NETMASK)
-DOM0_INTF="vif0.0"
+DOM0_INTF="eth0"
AC_ARG_WITH(dom0-intf,
- [ --with-dom0-intf=intf Set dom0 interface name [[default="vif0.0"]]],
+ [ --with-dom0-intf=intf Set dom0 interface name [[default="eth0"]]],
[ DOM0_INTF="$withval" ])
AC_SUBST(DOM0_INTF)
diff --git a/tools/xm-test/lib/XmTestLib/NetConfig.py b/tools/xm-test/lib/XmTestLib/NetConfig.py
index fe0cfb429f..919af65fdb 100644
--- a/tools/xm-test/lib/XmTestLib/NetConfig.py
+++ b/tools/xm-test/lib/XmTestLib/NetConfig.py
@@ -71,7 +71,7 @@ def getXendNetConfig():
def checkZeroconfAddresses():
# Make sure there aren't existing zeroconf addresses.
- rc, out = traceCommand("ip addr show |grep \"inet 169.254\" | grep -v vif")
+ rc, out = traceCommand("ip addr show |grep \"inet 169.254\" | grep eth0")
if rc == 0:
raise NetworkError("Zeroconf addresses already used: %s" % out)