>From 4fcd53aec1b9b562dbc5bf768da413193dd5f728 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Thu, 3 Jan 2013 14:34:13 -0800 Subject: [PATCH 3/4] Tests: avoid adding python options that are functions in the env This fix errors when running test --testenv --screen --- selftest/wscript | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/selftest/wscript b/selftest/wscript index 4733dc1..c7637a1 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,' + -- 1.7.9.5