From 9a8a383dc0b04e6ea3336bc00f425fc745d51bad Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Wed, 4 Jan 2017 03:55:03 -0500 Subject: [PATCH] update according to the comments --- xCAT-test/autotest/testcase/makentp/cases0 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/xCAT-test/autotest/testcase/makentp/cases0 b/xCAT-test/autotest/testcase/makentp/cases0 index ec4c5dc2a..75a137919 100644 --- a/xCAT-test/autotest/testcase/makentp/cases0 +++ b/xCAT-test/autotest/testcase/makentp/cases0 @@ -114,11 +114,8 @@ check:output=~ntp servers are: $$extntpserversip check:output=~stopping ntpserver check:output=~starting ntpserver check:output=~enabling ntpserver -cmd:if [ -f "/usr/sbin/ntp-wait" ];then ntp-wait; else sleep 1200; fi +cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]] || [[ "__GETNODEATTR($$CN,os)__" = "sles11.4" ]];then service ntp status;else service ntpd status; fi check:rc==0 -cmd:ntpq -p -check:output=~*$$extntpserversip -cmd:grep $$extntpserversip /etc/ntpd.conf +cmd:a=0;while ! `ntpq -n -c peers | awk '{print \$1}'|grep "*" >/dev/null`; do sleep 30;((a++));if [ $a -gt 30 ];then exit 1;fi done check:rc==0 end -