diff options
author | Simo Sorce <simo@redhat.com> | 2014-12-08 12:50:39 -0500 |
---|---|---|
committer | Simo Sorce <simo@redhat.com> | 2015-03-24 11:46:33 -0400 |
commit | 2a5bc7196b88e3b66d18f20aedb50568315f1374 (patch) | |
tree | 2a51cc81bf0760cf8dceaa0501a024d41d5dab26 /proxy/tests | |
parent | ca9e547858c8771148070ad68de75e0eee2a14fc (diff) | |
download | gss-proxy-2a5bc7196b88e3b66d18f20aedb50568315f1374.tar.gz gss-proxy-2a5bc7196b88e3b66d18f20aedb50568315f1374.tar.xz gss-proxy-2a5bc7196b88e3b66d18f20aedb50568315f1374.zip |
Do not open logfile multiple times
Instead reuse it across the whole test by passing it down
Signed-off-by: Simo Sorce <simo@redhat.com>
Diffstat (limited to 'proxy/tests')
-rwxr-xr-x | proxy/tests/runtests.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/proxy/tests/runtests.py b/proxy/tests/runtests.py index 4b7aa55..a941064 100755 --- a/proxy/tests/runtests.py +++ b/proxy/tests/runtests.py @@ -297,8 +297,7 @@ GSSPROXY_CONF_TEMPLATE = ''' ''' -def setup_gssproxy(testdir, env): - testlog = os.path.join(testdir, 'tests.log') +def setup_gssproxy(testdir, logfile, env): gssproxy = os.path.join(testdir, 'gssproxy') if os.path.exists(gssproxy): @@ -318,19 +317,17 @@ def setup_gssproxy(testdir, env): with open(conf, 'w+') as f: f.write(text) - with (open(testlog, 'a')) as logfile: - gproc = subprocess.Popen(["./gssproxy", "-i", "-d", - "-s", socket, "-c", conf], - stdout=logfile, stderr=logfile, - env=env, preexec_fn=os.setsid) + gproc = subprocess.Popen(["./gssproxy", "-i", "-d", + "-s", socket, "-c", conf], + stdout=logfile, stderr=logfile, + env=env, preexec_fn=os.setsid) return gproc, socket -def run_basic_test(testdir, env): +def run_basic_test(testdir, logfile, env): print "STARTING BASIC init/Accept tests" - testlog = os.path.join(testdir, 'tests.log') svc_name = "host@%s" % WRAP_HOSTNAME svc_keytab = os.path.join(testdir, SVC_KTNAME) @@ -348,13 +345,13 @@ def run_basic_test(testdir, env): pipe0 = os.pipe() pipe1 = os.pipe() - with (open(testlog, 'a')) as logfile: - p1 = subprocess.Popen(["./tests/t_init", svc_name], - stdin=pipe0[0], stdout=pipe1[1], - stderr=logfile, env=clienv, preexec_fn=os.setsid) - p2 = subprocess.Popen(["./tests/t_accept"], - stdin=pipe1[0], stdout=pipe0[1], - stderr=logfile, env=clienv, preexec_fn=os.setsid) + p1 = subprocess.Popen(["./tests/t_init", svc_name], + stdin=pipe0[0], stdout=pipe1[1], + stderr=logfile, env=clienv, preexec_fn=os.setsid) + p2 = subprocess.Popen(["./tests/t_accept"], + stdin=pipe1[0], stdout=pipe0[1], + stderr=logfile, env=svcenv, preexec_fn=os.setsid) + p1.wait() if p1.returncode != 0: print >> sys.stderr, "FAILED: Init test" @@ -380,6 +377,8 @@ if __name__ == '__main__': processes = dict() + testlog = os.path.join(testdir, 'tests.log') + try: wrapenv = setup_wrappers(testdir) @@ -392,10 +391,11 @@ if __name__ == '__main__': run_interposetest(testdir, gssapienv) - gproc, gpsocket = setup_gssproxy(testdir, keysenv) - processes['GSS-Proxy(%d)' % gproc.pid] = gproc - gssapienv['GSSPROXY_SOCKET'] = gpsocket - run_basic_test(testdir, gssapienv) + with (open(testlog, 'a')) as logfile: + gproc, gpsocket = setup_gssproxy(testdir, logfile, keysenv) + processes['GSS-Proxy(%d)' % gproc.pid] = gproc + gssapienv['GSSPROXY_SOCKET'] = gpsocket + run_basic_test(testdir, logfile, gssapienv) finally: for name in processes: |