Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Correct style in test-runner 

Correct test-runner.py so it passes flake8
python style checking.

Signed-off-by: Giuseppe Di Natale <dinatale2@llnl.gov>
This commit is contained in:
Giuseppe Di Natale 2016-10-06 10:11:06 -07:00
parent 0bde1f7cb5
commit 9285493adf
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tests/test-runner/cmd/test-runner.py
View File

@ -127,12 +127,12 @@ class Cmd(object):
self.killed = False self.killed = False
self.result = Result() self.result = Result()
if self.timeout == None: if self.timeout is None:
self.timeout = 60 self.timeout = 60
def __str__(self): def __str__(self):
return "Pathname: %s\nOutputdir: %s\nTimeout: %d\nUser: %s\n" % ( return "Pathname: %s\nOutputdir: %s\nTimeout: %d\nUser: %s\n" % (
self.pathname, self.outputdir, self.timeout, self.user) self.pathname, self.outputdir, self.timeout, self.user)
def kill_cmd(self, proc): def kill_cmd(self, proc):
""" """
@ -309,9 +309,10 @@ class Test(Cmd):
if len(self.post_user): if len(self.post_user):
post_user = ' (as %s)' % (self.post_user) post_user = ' (as %s)' % (self.post_user)
return "Pathname: %s\nOutputdir: %s\nTimeout: %d\nPre: %s%s\nPost: " \ return "Pathname: %s\nOutputdir: %s\nTimeout: %d\nPre: %s%s\nPost: " \
"%s%s\nUser: %s\n" % (self.pathname, self.outputdir, "%s%s\nUser: %s\n" % (
self.timeout, self.pre, pre_user, self.post, post_user, self.pathname, self.outputdir,
self.user) self.timeout, self.pre, pre_user, self.post, post_user,
self.user)
def verify(self, logger): def verify(self, logger):
""" """
@ -384,9 +385,9 @@ class TestGroup(Test):
if len(self.post_user): if len(self.post_user):
post_user = ' (as %s)' % (self.post_user) post_user = ' (as %s)' % (self.post_user)
return "Pathname: %s\nOutputdir: %s\nTests: %s\nTimeout: %d\n" \ return "Pathname: %s\nOutputdir: %s\nTests: %s\nTimeout: %d\n" \
"Pre: %s%s\nPost: %s%s\nUser: %s\n" % (self.pathname, "Pre: %s%s\nPost: %s%s\nUser: %s\n" % (
self.outputdir, self.tests, self.timeout, self.pre, pre_user, self.pathname, self.outputdir, self.tests, self.timeout,
self.post, post_user, self.user) self.pre, pre_user, self.post, post_user, self.user)
def verify(self, logger): def verify(self, logger):
""" """
@ -428,8 +429,8 @@ class TestGroup(Test):
if not verify_file(os.path.join(self.pathname, test)): if not verify_file(os.path.join(self.pathname, test)):
del self.tests[self.tests.index(test)] del self.tests[self.tests.index(test)]
logger.info("Warning: Test '%s' removed from TestGroup '%s' " logger.info("Warning: Test '%s' removed from TestGroup '%s' "
"because it failed verification." % (test, "because it failed verification." %
self.pathname)) (test, self.pathname))
return len(self.tests) is not 0 return len(self.tests) is not 0
@ -634,7 +635,7 @@ class TestRun(object):
components -= 1 components -= 1
for testfile in tmp_dict.keys(): for testfile in tmp_dict.keys():
uniq = '/'.join(testfile.split('/')[components:]).lstrip('/') uniq = '/'.join(testfile.split('/')[components:]).lstrip('/')
if not uniq in l: if uniq not in l:
l.append(uniq) l.append(uniq)
tmp_dict[testfile].outputdir = os.path.join(base, uniq) tmp_dict[testfile].outputdir = os.path.join(base, uniq)
else: else:
@ -705,8 +706,8 @@ class TestRun(object):
m, s = divmod(time() - self.starttime, 60) m, s = divmod(time() - self.starttime, 60)
h, m = divmod(m, 60) h, m = divmod(m, 60)
print '\nRunning Time:\t%02d:%02d:%02d' % (h, m, s) print '\nRunning Time:\t%02d:%02d:%02d' % (h, m, s)
print 'Percent passed:\t%.1f%%' % ((float(Result.runresults['PASS']) / print 'Percent passed:\t%.1f%%' % (
float(Result.total)) * 100) (float(Result.runresults['PASS']) / float(Result.total)) * 100)
print 'Log directory:\t%s' % self.outputdir print 'Log directory:\t%s' % self.outputdir
@ -717,10 +718,10 @@ def verify_file(pathname):
if os.path.isdir(pathname) or os.path.islink(pathname): if os.path.isdir(pathname) or os.path.islink(pathname):
return False return False
if (os.path.isfile(pathname) and os.access(pathname, os.X_OK)) or \ for ext in '', '.ksh', '.sh':
(os.path.isfile(pathname+'.ksh') and os.access(pathname+'.ksh', os.X_OK)) or \ script_path = pathname + ext
(os.path.isfile(pathname+'.sh') and os.access(pathname+'.sh', os.X_OK)): if os.path.isfile(script_path) and os.access(script_path, os.X_OK):
return True return True
return False return False
@ -731,15 +732,13 @@ def verify_user(user, logger):
sudo without being prompted for a password. sudo without being prompted for a password.
""" """
testcmd = [SUDO, '-n', '-u', user, TRUE] testcmd = [SUDO, '-n', '-u', user, TRUE]
can_sudo = exists = True
if user in Cmd.verified_users: if user in Cmd.verified_users:
return True return True
try: try:
_ = getpwnam(user) getpwnam(user)
except KeyError: except KeyError:
exists = False
logger.info("Warning: user '%s' does not exist.", user) logger.info("Warning: user '%s' does not exist.", user)
return False return False
@ -782,7 +781,7 @@ def options_cb(option, opt_str, value, parser):
path_options = ['runfile', 'outputdir', 'template', 'testdir'] path_options = ['runfile', 'outputdir', 'template', 'testdir']
if option.dest is 'runfile' and '-w' in parser.rargs or \ if option.dest is 'runfile' and '-w' in parser.rargs or \
option.dest is 'template' and '-c' in parser.rargs: option.dest is 'template' and '-c' in parser.rargs:
fail('-c and -w are mutually exclusive.') fail('-c and -w are mutually exclusive.')
if opt_str in parser.rargs: if opt_str in parser.rargs: