From fca4035996c93f8f05ea3837133961e28a1248d6 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 16 Jun 2014 16:26:31 -0400 Subject: Change test executables into modules Create a common tests framework and convert tests into modules loaded at runtime using the ipsilon plugin framework. Signed-off-by: Simo Sorce --- tests/tests.py | 216 +++++++++------------------------------------------------ 1 file changed, 34 insertions(+), 182 deletions(-) (limited to 'tests/tests.py') diff --git a/tests/tests.py b/tests/tests.py index 6fa880d..4690442 100755 --- a/tests/tests.py +++ b/tests/tests.py @@ -18,21 +18,27 @@ # along with this program. If not, see . import argparse -import ConfigParser from datetime import datetime +import inspect +from ipsilon.util import plugin import logging import os -import pwd -import shutil -import signal -import subprocess import sys -from string import Template +import subprocess +import traceback logger = None +class Tests(object): + + def __init__(self): + p = plugin.Plugins() + (pathname, dummy) = os.path.split(inspect.getfile(Tests)) + self.plugins = p.get_plugins(pathname, 'IpsilonTest') + + def parse_args(): parser = argparse.ArgumentParser(description='Ipsilon Tests Environment') parser.add_argument('--path', default='%s/testdir' % os.getcwd(), @@ -46,12 +52,12 @@ def parse_args(): return vars(parser.parse_args()) -def openlogs(path, test): +def openlogs(path, name): global logger # pylint: disable=W0603 logger = logging.getLogger() try: datestr = datetime.now().strftime("%Y-%m-%d_%H:%M:%S") - filename = '%s/test-%s-%s.log' % (path, test, datestr) + filename = '%s/test-%s-%s.log' % (path, name, datestr) lh = logging.FileHandler(filename) except IOError, e: print >> sys.stderr, 'Unable to open %s (%s)' % (filename, str(e)) @@ -62,115 +68,6 @@ def openlogs(path, test): logger.setLevel(logging.DEBUG) -def force_remove(op, name, info): - os.chmod(name, 0700) - os.remove(name) - - -def setup_http(httpdir, addr, port): - os.mkdir(httpdir) - os.mkdir(httpdir + '/conf.d') - os.mkdir(httpdir + '/html') - os.mkdir(httpdir + '/logs') - os.symlink('/etc/httpd/modules', httpdir + '/modules') - - with open('tests/httpd.conf') as f: - t = Template(f.read()) - text = t.substitute({'HTTPROOT': httpdir, - 'HTTPADDR': addr, 'HTTPPORT': port}) - with open(httpdir + '/httpd.conf', 'w+') as f: - f.write(text) - - -def setup_test(path, test): - profile = 'tests/%s.cfg' % test - if not os.path.exists(profile): - raise ValueError('Unrecognized test name [%s]' % test) - - opts = {} - config = ConfigParser.ConfigParser() - config.read(profile) - if 'tests' not in config.sections(): - raise ValueError('Missing [tests] in profile [%s]' % test) - T = config.options('tests') - for t in T: - opts[t] = config.get('tests', t) - - base = '%s/%s' % (path, test) - if os.path.exists(base): - shutil.rmtree(base, onerror=force_remove) - os.makedirs(base) - shutil.copytree('templates', base + '/templates') - os.mkdir(base + '/etc') - os.mkdir(base + '/lib') - os.mkdir(base + '/lib/' + test) - os.mkdir(base + '/log') - - with open(profile) as f: - t = Template(f.read()) - text = t.substitute({'TESTDIR': base, 'ROOTDIR': os.getcwd(), - 'TEST_USER': pwd.getpwuid(os.getuid())[0]}) - with open(base + '/profile.cfg', 'w+') as f: - f.write(text) - - opts['basedir'] = base - return opts - - -def generate_profile(profile, name): - config = ConfigParser.ConfigParser() - config.read(profile) - - global_section = '%s_globals' % name - global_options = {} - if global_section in config.sections(): - G = config.options(global_section) - for g in G: - global_options[g] = config.get(global_section, g) - - args_section = '%s_arguments' % name - args_options = {} - if args_section in config.sections(): - A = config.options(args_section) - for a in A: - args_options[a] = config.get(args_section, a) - - newconf = ConfigParser.ConfigParser() - newconf.add_section('globals') - for k in global_options.keys(): - newconf.set('globals', k, global_options[k]) - newconf.add_section('arguments') - for k in args_options.keys(): - newconf.set('arguments', k, args_options[k]) - - filename = os.path.join(os.path.dirname(profile), '%s_profile.cfg' % name) - with open(filename, 'wb') as f: - newconf.write(f) - - return filename - - -def fixup_sp_httpd(httpdir): - location = """ - -Alias /sp ${HTTPDIR}/sp - - - Require all granted - -""" - index = """WORKS!""" - - t = Template(location) - text = t.substitute({'HTTPDIR': httpdir}) - with open(httpdir + '/conf.d/ipsilon-saml.conf', 'a') as f: - f.write(text) - - os.mkdir(httpdir + '/sp') - with open(httpdir + '/sp/index.html', 'w') as f: - f.write(index) - - def try_wrappers(base, wrappers): if wrappers == 'no': return {} @@ -192,83 +89,38 @@ def try_wrappers(base, wrappers): return wenv + if __name__ == '__main__': args = parse_args() + tests = Tests() + if args['test'] not in tests.plugins: + print >> sys.stderr, "Unknown test [%s]" % args['test'] + sys.exit(1) + test = tests.plugins[args['test']] + if not os.path.exists(args['path']): os.makedirs(args['path']) + openlogs(args['path'], args['test']) - options = setup_test(args['path'], args['test']) - basedir = options['basedir'] + test.setup_base(args['path'], test) - env = try_wrappers(basedir, args['wrappers']) - env['PYTHONPATH'] = './' + env = try_wrappers(test.testdir, args['wrappers']) + env['PYTHONPATH'] = test.rootdir - srvs = [] try: - for h in options['servers'].split(','): - sname, saddr, sport = h.split(':') - basehttpdir = '%s/%s' % (basedir, sname) - setup_http(basehttpdir, saddr, sport) - - print "Installing IDP server %s" % sname - sprofile = generate_profile('%s/profile.cfg' % basedir, sname) - p = subprocess.Popen(['./ipsilon/install/ipsilon-server-install', - '--config-profile=%s' % sprofile], env=env, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = p.communicate() - logger.error(stderr) - logger.info(stdout) - if p.returncode: - sys.exit(p.returncode) - - os.symlink('%s/ipsilon' % os.getcwd(), - '%s/lib/%s/ipsilon' % (basedir, sname)) - - print "Starting httpd server in %s" % basehttpdir - srv = subprocess.Popen(['/usr/sbin/httpd', '-DFOREGROUND', - '-f', basehttpdir + '/httpd.conf'], - env=env, preexec_fn=os.setsid) - srvs.append(srv) - - for h in options['clients'].split(','): - sname, saddr, sport = h.split(':') - basehttpdir = '%s/%s' % (basedir, sname) - setup_http(basehttpdir, saddr, sport) - - print "Installing SP server %s" % sname - sprofile = generate_profile('%s/profile.cfg' % basedir, sname) - p = subprocess.Popen(['./ipsilon/install/ipsilon-client-install', - '--config-profile=%s' % sprofile], env=env, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = p.communicate() - logger.error(stderr) - logger.info(stdout) - if p.returncode: - sys.exit(p.returncode) - - fixup_sp_httpd(basehttpdir) - - print "Starting httpd server in %s" % basehttpdir - srv = subprocess.Popen(['/usr/sbin/httpd', '-DFOREGROUND', - '-f', basehttpdir + '/httpd.conf'], - env=env, preexec_fn=os.setsid) - srvs.append(srv) - - print "Testing installation" - if os.path.exists('tests/%s.py' % args['test']): - code = subprocess.call(['./tests/%s.py' % args['test'], basedir], - env=env) - if code: - sys.exit(code) - except Exception: # pylint: disable=broad-except + test.setup_servers(env) + + code = test.run(env) + if code: + sys.exit(code) + except Exception, e: # pylint: disable=broad-except + print >> sys.stderr, "Error: %s" % repr(e) + traceback.print_exc(None, sys.stderr) sys.exit(1) finally: - for srv in srvs: - os.killpg(srv.pid, signal.SIGTERM) + test.wait() print "FINISHED" -- cgit