xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 01:26:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5965 from tingtli/task559

Browse Source 
refine test cases which were designed in flat originally to support both flat and hierarchy
This commit is contained in:
Weihua Hu 2019-01-30 14:14:19 +08:00 committed by GitHub
commit 0b673cfcd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-test/autotest/testcase/chtab/cases0
View File

@ -79,7 +79,7 @@ description:chtab with error table
label:mn_only,ci_test,db
cmd:chtab error=error site.comment=error
check:rc!=0
check:output=~no such column|column \"error\" does not exist
check:output=~no such column|column \"error\" does not exist|Unknown column \'error\'
end

11
xCAT-test/autotest/testcase/xdcp/cases1
View File

@ -1,10 +1,12 @@
start:xdcp_nonroot_user
label:cn_os_ready,parallel_cmds
cmd:useradd -m xyzzy
cmd:lsdef -t site -z clustersite > /tmp/site.stanza
cmd:chdef -t site SNsyncfiledir=/tmp
cmd:servicenode=`lsdef $$CN |grep servicenode |awk -F= '{print $2}'`; if [ -n "$servicenode" ]; then xdsh $servicenode "useradd -m xyzzy";useradd -m xyzzy;else useradd -m xyzzy;fi
check:rc==0
cmd:bash -c "( cd ~root && tar cf - .xcat .ssh ) | ( cd ~xyzzy && tar xf - )"
cmd:servicenode=`lsdef $$CN |grep servicenode |awk -F= '{print $2}'`; if [ -n "$servicenode" ]; then xdsh $servicenode "bash -c \"( cd ~root && tar cf - .xcat .ssh ) | ( cd ~xyzzy && tar xf - )\"";bash -c "( cd ~root && tar cf - .xcat .ssh ) | ( cd ~xyzzy && tar xf - )";else bash -c "( cd ~root && tar cf - .xcat .ssh ) | ( cd ~xyzzy && tar xf - )";fi
check:rc==0
cmd:chown -R xyzzy ~xyzzy/.xcat ~xyzzy/.ssh
cmd:servicenode=`lsdef $$CN |grep servicenode |awk -F= '{print $2}'`; if [ -n "$servicenode" ]; then xdsh $servicenode "chown -R xyzzy ~xyzzy/.xcat ~xyzzy/.ssh";chown -R xyzzy ~xyzzy/.xcat ~xyzzy/.ssh;else chown -R xyzzy ~xyzzy/.xcat ~xyzzy/.ssh;fi
check:rc==0
cmd:xdsh $$CN "useradd -m xyzzy"
check:rc==0
@ -18,6 +20,7 @@ cmd:xdsh $$CN "stat -c '%U' /tmp/sysctl.conf"
check:output=~xyzzy
cmd:xdsh $$CN "userdel xyzzy"
check:rc==0
cmd:userdel xyzzy
cmd:servicenode=`lsdef $$CN |grep servicenode |awk -F= '{print $2}'`; if [ -n "$servicenode" ]; then xdsh $servicenode "userdel xyzzy";userdel xyzzy;else userdel xyzzy;fi
check:rc==0
cmd:if [ -e /tmp/site.standa ]; then cat /tmp/site.standa | mkdef -z -f; rm -rf /tmp/site.standa; fi
end

2
xCAT-test/autotest/testcase/xdsh/cases0
View File

@ -13,7 +13,7 @@ end
start:xdsh_regular_command
label:cn_os_ready,parallel_cmds
cmd:XCATBYPASS=1 xdsh $$CN "ps -ef"
cmd:xdsh $$CN "ps -ef"
check:rc==0
check:output=~$$CN:\s+UID\s+PID\s+PPID\s+C\s+STIME\s+TTY\s+TIME\s+CMD
end

4
xCAT-test/autotest/testcase/xdsh/cases1
View File

@ -3,10 +3,10 @@ description: Test the exit code when command xdsh failed
label:cn_os_ready,parallel_cmds
cmd:xdsh $$CN date
check:rc==0
cmd:mv /root/.ssh/id_rsa /root/.ssh/id_rsa.backup
cmd:servicenode=`lsdef $$CN |grep servicenode |awk -F= '{print $2}'`; if [ -n "$servicenode" ]; then xdsh $$SN mv /root/.ssh/id_rsa /root/.ssh/id_rsa.backup;else mv /root/.ssh/id_rsa /root/.ssh/id_rsa.backup;fi
check:rc==0
cmd:xdsh $$CN date
check:rc!=0
cmd:mv /root/.ssh/id_rsa.backup /root/.ssh/id_rsa
cmd:servicenode=`lsdef $$CN |grep servicenode |awk -F= '{print $2}'`; if [ -n "$servicenode" ]; then xdsh $$SN mv /root/.ssh/id_rsa.backup /root/.ssh/id_rsa;else mv /root/.ssh/id_rsa.backup /root/.ssh/id_rsa;fi
check:rc==0
end