From df8ae5bd9adb4a78bd678cdf9f2173afefc389d6 Mon Sep 17 00:00:00 2001 From: huweihua Date: Wed, 16 May 2018 23:11:04 -0400 Subject: [PATCH] Revert "Further modification for adding test case for 922 (#5193)" This reverts commit 326144f92e1e29e6633063e52bac3b1f46c1b3f2. --- .../installation/reg_linux_statelite_installation_flat | 6 ++++-- .../reg_linux_statelite_installation_hierarchy_by_nfs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat index 54d600128..a3d62e710 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat @@ -51,8 +51,6 @@ check:rc==0 cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute check:rc==0 -cmd:rootimagedir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute -i rootimgdir -c|awk -F"=" '{print $2}'`; chroot $rootimagedir/rootimg useradd xcatuser -check:rc==0 cmd:liteimg __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute check:rc==0 @@ -87,8 +85,12 @@ check:rc!=0 cmd:xdsh $$CN "ls -l /bin/ping" cmd:xdsh $$CN "ping -c 1 127.0.0.1" check:rc==0 +cmd:xdsh $$CN "useradd -m xcatuser" +check:rc==0 cmd:xdsh $$CN "su - xcatuser sh -c \"ping -c 1 127.0.0.1\"" check:rc==0 +cmd:xdsh $$CN "userdel xcatuser" +check:rc==0 cmd:output=$(xdsh $$CN ls -al / |grep test.statelite);if [[ $? -eq 0 ]];then xdsh $$CN rm -rf /test.tatelite;fi cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then rm -rf $rootimgdir;fi check:rc==0 diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs index 90d929feb..27e0b4439 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs @@ -69,8 +69,6 @@ check:rc==0 cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute check:rc==0 -cmd:rootimagedir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute -i rootimgdir -c|awk -F"=" '{print $2}'`; chroot $rootimagedir/rootimg useradd xcatuser -check:rc==0 cmd:liteimg __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute check:rc==0 cmd:prsync /install $$SN:/ @@ -107,8 +105,12 @@ check:rc!=0 cmd:xdsh $$CN "ls -l /bin/ping" cmd:xdsh $$CN "ping -c 1 127.0.0.1" check:rc==0 +cmd:xdsh $$CN "useradd -m xcatuser" +check:rc==0 cmd:xdsh $$CN "su - xcatuser sh -c \"ping -c 1 127.0.0.1\"" check:rc==0 +cmd:xdsh $$CN "userdel xcatuser" +check:rc==0 cmd:output=$(xdsh $$CN ls -al / |grep test.statelite);if [[ $? -eq 0 ]];then xdsh $$CN rm -rf /test.tatelite;fi cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then rm -rf $rootimgdir;fi check:rc==0