From 1fe1a803368420de608116b0f2dbd82db1a448c9 Mon Sep 17 00:00:00 2001 From: besawn <38794505+besawn@users.noreply.github.com> Date: Fri, 18 Feb 2022 17:04:30 -0500 Subject: [PATCH] Changed failing tests to look for variable whitespace instead of fixed --- xCAT-test/autotest/testcase/makedns/cases0 | 98 +++++++++++----------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/xCAT-test/autotest/testcase/makedns/cases0 b/xCAT-test/autotest/testcase/makedns/cases0 index 867fcfef5..d9dc3a539 100644 --- a/xCAT-test/autotest/testcase/makedns/cases0 +++ b/xCAT-test/autotest/testcase/makedns/cases0 @@ -25,12 +25,12 @@ check:rc==0 cmd:makedns dnstestnode check:rc==0 cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:makedns -d dnstestnode check:rc==0 cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output=~(server can't find dnstestnode) cmd:rmdef -t node dnstestnode check:rc==0 @@ -56,12 +56,12 @@ cmd:ps aux|grep name cmd:makedns dnstestnode check:rc==0 cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:makedns -d dnstestnode check:rc==0 cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output=~(server can't find dnstestnode) cmd:rmdef -t node dnstestnode check:rc==0 @@ -87,7 +87,7 @@ cmd:cat /etc/bind/named.conf check:rc==0 check:output=~zone "100.100.100.IN-ADDR.ARPA." cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:rm -f /etc/hosts check:rc==0 @@ -101,7 +101,7 @@ cmd:cat /etc/bind/named.conf check:rc==0 check:output!~zone "100.100.100.IN-ADDR.ARPA." cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output=~(server can't find dnstestnode) end @@ -121,7 +121,7 @@ cmd:cat /etc/named.conf check:rc==0 check:output=~zone "100.100.100.IN-ADDR.ARPA." cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:yes|cp -rf /etc/hosts.testbak /etc/hosts check:rc==0 @@ -134,7 +134,7 @@ cmd:cat /etc/named.conf check:rc==0 check:output!~zone "100.100.100.IN-ADDR.ARPA." cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output=~(server can't find dnstestnode) end @@ -159,7 +159,7 @@ check:rc==0 cmd:makedns check:rc==0 cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:if [ -f "/etc/named.conf" ]; then a="/etc/named.conf"; elif [ -f "/etc/bind/named.conf" ]; then a="/etc/bind/named.conf";fi; cat $a > /tmp/makedns_named_conf.new check:rc==0 @@ -179,7 +179,7 @@ cmd:if [ -f "/etc/named.conf" ]; then a="/etc/named.conf"; elif [ -f "/etc/bind/ check:rc==0 check:output!~zone "100.100.100.IN-ADDR.ARPA." cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output=~(server can't find dnstestnode) end @@ -223,7 +223,7 @@ cmd:service named status check:rc==0 check:output=~running cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:xdsh $$SN "service named status" check:rc==0 @@ -232,10 +232,10 @@ cmd:xdsh $$SN "more /etc/named.conf" check:rc==0 check:output=~forward only cmd:nslookup $$SN $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find $$SN) cmd:nslookup dnstestnode $$SN -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output!~(server can't find dnstestnode) cmd:rm -f /etc/hosts check:rc==0 @@ -290,7 +290,7 @@ cmd:service named status check:rc==0 check:output=~running cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:xdsh $$SN "service named status" check:rc==0 @@ -299,10 +299,10 @@ cmd:xdsh $$SN "more /etc/named.conf" check:rc==0 check:output=~forward only cmd:nslookup $$SN $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find $$SN) cmd:nslookup dnstestnode $$SN -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output!~(server can't find dnstestnode) cmd:rm -f /etc/hosts check:rc==0 @@ -363,7 +363,7 @@ check:output=~1 cmd:service named status check:output=~running cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:xdsh $$SN "service named status" check:output=~running @@ -371,10 +371,10 @@ cmd:xdsh $$SN "more /etc/named.conf" check:rc==0 check:output=~type slave cmd:nslookup $$SN $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find $$SN) cmd:nslookup dnstestnode $$SN -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output!~(server can't find dnstestnode) cmd:rm -f /etc/hosts check:rc==0 @@ -434,7 +434,7 @@ check:output=~1 cmd:service named status check:output=~running cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:xdsh $$SN "service named status" check:output=~running @@ -442,10 +442,10 @@ cmd:xdsh $$SN "more /etc/named.conf" check:rc==0 check:output=~type slave cmd:nslookup $$SN $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find $$SN) cmd:nslookup dnstestnode $$SN -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output!~(server can't find dnstestnode) cmd:rm -f /etc/hosts check:rc==0 @@ -485,11 +485,11 @@ check:rc==0 check:output=~running cmd:nslookup dnstestnode $$MN check:rc==0 -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:nslookup dnstestnode $$SN check:rc==0 -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output!~(server can't find dnstestnode) cmd:service named stop check:rc==0 @@ -497,11 +497,11 @@ cmd:service named status check:output=~stopped cmd:nslookup dnstestnode $$MN check:rc!=0 -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output=~(server can't find dnstestnode) cmd:nslookup dnstestnode $$SN check:rc==0 -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output!~(server can't find dnstestnode) cmd:service named start check:rc==0 @@ -543,20 +543,20 @@ cmd:xdsh $$SN "service xcatd status" check:rc==0 check:output=~running cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:nslookup dnstestnode $$SN -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output!~(server can't find dnstestnode) cmd:service named stop check:rc==0 cmd:service named status check:output=~unused cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output=~(server can't find dnstestnode) cmd:nslookup dnstestnode $$SN -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output!~(server can't find dnstestnode) cmd:service named start check:rc==0 @@ -600,11 +600,11 @@ check:rc==0 check:output=~running cmd:nslookup dnstestnode $$MN check:rc==0 -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:nslookup dnstestnode $$SN check:rc==0 -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output!~(server can't find dnstestnode) cmd:xdsh $$SN "service named stop" check:rc==0 @@ -613,11 +613,11 @@ check:rc!=0 check:output=~stopped cmd:nslookup dnstestnode $$MN check:rc==0 -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:nslookup dnstestnode $$SN check:rc!=0 -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output=~(server can't find dnstestnode) cmd:xdsh $$SN "service named start" check:rc==0 @@ -660,20 +660,20 @@ cmd:xdsh $$SN "service xcatd status" check:rc==0 check:output=~running cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:nslookup dnstestnode $$SN -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output!~(server can't find dnstestnode) cmd:xdsh $$SN "service named stop" check:rc==0 cmd:xdsh $$SN "service named status" check:output=~unused cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:nslookup dnstestnode $$SN -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output=~(server can't find dnstestnode) cmd:xdsh $$SN "service named start" check:rc==0 @@ -712,21 +712,21 @@ cmd:makedns dnstestnode check:rc==0 cmd:nslookup dnstestnode $$MN check:rc==0 -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:sleep 2 cmd:nslookup dnstestnode $$SN check:rc==0 -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output!~(server can't find dnstestnode) cmd:makedns -d dnstestnode check:rc==0 cmd:nslookup dnstestnode $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output=~(server can't find dnstestnode) cmd:sleep 2 cmd:nslookup dnstestnode $$SN -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output=~(server can't find dnstestnode) cmd:rmdef -t node dnstestnode check:rc==0 @@ -805,7 +805,7 @@ cmd:makedns dnstestnode check:rc==0 cmd:nslookup dnstestnode $$MN check:rc==0 -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:xdsh $$SN "service named start" check:rc==0 @@ -815,7 +815,7 @@ check:output=~running cmd:sleep 2 cmd:nslookup dnstestnode $$SN check:rc==0 -check:output=~Server: $$SN +check:output=~Server:\s*$$SN check:output!~(server can't find $$CN) cmd:xdsh $$SN "service named stop" check:rc==0 @@ -823,7 +823,7 @@ cmd:makedns -d dnstestnode check:rc==0 cmd:nslookup dnstestnode $$MN check:rc!=0 -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output=~(server can't find $$CN) cmd:xdsh $$SN "service named start" check:rc==0 @@ -858,22 +858,22 @@ cmd:tabdump networks cmd:makedns -n dnstestnode[1-10] check:rc==0 cmd:nslookup dnstestnode5 $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:makedns -d dnstestnode[1-10] check:rc==0 cmd:nslookup dnstestnode5 $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output=~(server can't find dnstestnode) cmd:makedns -n dnsnode check:rc==0 cmd:nslookup dnstestnode5 $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output!~(server can't find dnstestnode) cmd:makedns -d dnsnode check:rc==0 cmd:nslookup dnstestnode5 $$MN -check:output=~Server: $$MN +check:output=~Server:\s*$$MN check:output=~(server can't find dnstestnode) cmd:rmdef -t node dnstestnode[1-10] check:rc==0