From aa9975fde11986513eb38e99bc0d04b56d6b4636 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Thu, 7 May 2015 02:45:54 -0400 Subject: [PATCH] modify makedhcp testcase --- xCAT-test/autotest/testcase/makedhcp/cases0 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xCAT-test/autotest/testcase/makedhcp/cases0 b/xCAT-test/autotest/testcase/makedhcp/cases0 index 415cc22a7..64f87a839 100644 --- a/xCAT-test/autotest/testcase/makedhcp/cases0 +++ b/xCAT-test/autotest/testcase/makedhcp/cases0 @@ -5,9 +5,12 @@ cmd:makedhcp -n check:rc==0 cmd:ls /etc/dhcp/dhcpd.conf || ls /etc/dhcpd.conf check:rc==0 +cmd:sleep 20 cmd:ps -e | grep dhcpd check:rc==0 check:output=~dhcpd +cmd:if cat /etc/*release |grep Ubuntu >/dev/null;then service isc-dhcp-server status;else service dhcpd status;fi +check:output=~running cmd:if [ -f "/etc/dhcp/dhcpd.conf" ]; then mv -f /etc/dhcp/dhcpd.conf.bak /etc/dhcp/dhcpd.conf; elif [ -f "/etc/dhcpd.conf" ]; then mv -f /etc/dhcpd.conf.bak /etc/dhcpd.conf; fi end