From 154c1bb4066696ffa96da3b6e0f6adb7d4c60b5e Mon Sep 17 00:00:00 2001 From: huweihua Date: Wed, 27 Mar 2019 04:23:39 -0400 Subject: [PATCH] refine getmacs test cases --- xCAT-test/autotest/testcase/getmacs/cases0 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/xCAT-test/autotest/testcase/getmacs/cases0 b/xCAT-test/autotest/testcase/getmacs/cases0 index 659ac4919..61e22c4cb 100644 --- a/xCAT-test/autotest/testcase/getmacs/cases0 +++ b/xCAT-test/autotest/testcase/getmacs/cases0 @@ -2,30 +2,40 @@ start:getmacs_noderange label:others cmd:tabdump mac > /tmp/mac.csv cmd:chtab -d node=$$CN mac +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi +cmd:sleep 10 cmd:getmacs $$CN check:rc==0 check:output=~[a-f0-9A-F]{12}|[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2} cmd:tabdump mac | grep $$CN check:output=~[a-f0-9A-F]{12}|[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2} cmd:tabrestore /tmp/mac.csv +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi cmd:rm /tmp/mac.csv end + start:getmacs_d label:others cmd:tabdump mac > /tmp/mac.csv cmd:chtab -d node=$$CN mac +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi +cmd:sleep 10 cmd:getmacs $$CN -d check:rc==0 check:output=~[a-f0-9A-F]{12}|[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2} cmd:tabdump mac | grep $$CN check:output!~[a-f0-9A-F]{12}|[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2} cmd:tabrestore /tmp/mac.csv +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi cmd:rm /tmp/mac.csv end + start:getmacs_f_D label:others cmd:tabdump mac > /tmp/mac.csv cmd:chtab -d node=$$CN mac +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi +cmd:sleep 10 cmd:getmacs $$CN -f -D check:rc==0 check:output=~[a-f0-9A-F]{12}|[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2} @@ -35,4 +45,5 @@ cmd:tabrestore /tmp/mac.csv cmd:rm /tmp/mac.csv cmd:rpower $$CN on cmd:sleep 300 +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi end