From: Dan S. <dan...@us...> - 2005-10-27 20:10:55
|
Update of /cvsroot/ltp/xmtest/tests/help In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28700/tests/help Modified Files: 05_help_nonroot_pos.py Log Message: Ewan's changes - 0.3.6 Index: 05_help_nonroot_pos.py =================================================================== RCS file: /cvsroot/ltp/xmtest/tests/help/05_help_nonroot_pos.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 05_help_nonroot_pos.py 27 Oct 2005 17:02:32 -0000 1.2 --- 05_help_nonroot_pos.py 27 Oct 2005 20:10:36 -0000 1.3 *************** *** 2,35 **** # Copyright (C) International Business Machines Corp., 2005 # Author: Dan Smith <da...@us...> from XmTestLib import * ! import os ! import re ! ! USER="nobody" ! ! def hasNobody(): ! ! if not os.access("/etc/passwd", os.R_OK): ! SKIP("Unable to read /etc/passwd") ! ! passwd = file("/etc/passwd") ! ! lines = passwd.readlines() ! ! for l in lines: ! if re.search("^%s" % USER, l): ! return True ! ! return False ! ! if not hasNobody(): ! SKIP("Need a '%s' user to check for non-root access!" % USER) ! ! status, output = traceCommand("su %s -s /bin/sh -c '/usr/sbin/xm help'" % USER, ! logOutput=True) ! if not re.search("Usage", output): ! FAIL("'xm help' failed as user '%s'" % USER) --- 2,17 ---- # Copyright (C) International Business Machines Corp., 2005 + # Copyright (C) XenSource Ltd, 2005 # Author: Dan Smith <da...@us...> + # Author: Woody Marvel <ma...@us...> + # Author: Ewan Mellor <ew...@xe...> from XmTestLib import * ! becomeNonRoot() ! status, output = traceCommand("xm help") ! eyecatcher = "Usage:" ! where = output.find(eyecatcher) ! if where != 0: ! FAIL("xm help: didn't see the usage string") |