summaryrefslogtreecommitdiff
path: root/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-03-04 16:32:56 +0100
committerJelmer Vernooij <jelmer@samba.org>2012-03-04 18:02:07 +0100
commitaaa7cf67abe2d11b2a7de98964f25f17ce172705 (patch)
treedde28a9e42dbe783e2bc7f673720f576d9414ed5 /selftest
parent570dbf2ee0864c963c27108b4527fabe2f1b31d3 (diff)
downloadsamba-aaa7cf67abe2d11b2a7de98964f25f17ce172705.tar.gz
samba-aaa7cf67abe2d11b2a7de98964f25f17ce172705.tar.bz2
samba-aaa7cf67abe2d11b2a7de98964f25f17ce172705.zip
selftest.py: Fix signal handling.
Diffstat (limited to 'selftest')
-rwxr-xr-xselftest/selftest.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/selftest/selftest.py b/selftest/selftest.py
index 516d43c5cf..c59bcff431 100755
--- a/selftest/selftest.py
+++ b/selftest/selftest.py
@@ -81,7 +81,7 @@ opts, args = parser.parse_args()
subunit_ops = subunithelper.SubunitOps(sys.stdout)
-def pipe_handler(sig):
+def pipe_handler(sig, frame):
sys.stderr.write("Exiting early because of SIGPIPE.\n")
sys.exit(1)
@@ -276,6 +276,8 @@ if os.environ.get("SMBD_MAXTIME", ""):
def has_socket_wrapper(bindir):
+ """Check if Samba has been built with socket wrapper support.
+ """
f = StringIO()
subprocess.check_call([os.path.join(bindir, "smbd"), "-b"], stdout=f)
for l in f.readlines():
@@ -506,7 +508,7 @@ exported_envvars = [
"LOCAL_PATH"
]
-def handle_sigdie(signame):
+def handle_sigdie(signame, frame):
env_manager.teardown_all()
sys.stderr.write("Received signal %s" % signame)
sys.exit(1)