From 95fc53a37b9c75cbc1d13432887de095ff779a1e Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Thu, 3 Jan 2013 14:34:13 -0800 Subject: Tests: avoid adding python options that are functions in the env This fix errors when running test --testenv --screen Signed-off-by: Matthieu Patou Reviewed-by: Andrew Bartlett --- selftest/wscript | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'selftest/wscript') diff --git a/selftest/wscript b/selftest/wscript index 4733dc17cd..c7637a19ac 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -6,6 +6,7 @@ import Scripting, os, Options, Utils, Environment, optparse, sys from samba_utils import * from samba_autoconf import * +import types def set_options(opt): @@ -114,7 +115,11 @@ def cmd_testonly(opt): # put all command line options in the environment as TESTENV_*=* for o in dir(Options.options): if o[0:1] != '_': - os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, '')) + val = getattr(Options.options, o, '') + if not issubclass(type(val), types.FunctionType) \ + and not issubclass(type(val), types.MethodType): + os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, '')) + binary_mapping = ('nmblookup3:nmblookup,' + 'nmblookup4:nmblookup4,' + -- cgit