1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
From f78f8b1a46534db3a4547323ba952c1fa1b41fe9 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Fri, 30 May 2014 17:13:31 -0400
Subject: [PATCH 11/13] Have k5test.py provide 'runenv' to python tests
Expose the formerly-internal _runenv module as k5test.runenv, so that
settings we store in the top-level runenv.py will be available to them.
ticket: 7929
---
src/util/k5test.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/util/k5test.py b/src/util/k5test.py
index a2bfbee..8cb477d 100644
--- a/src/util/k5test.py
+++ b/src/util/k5test.py
@@ -177,6 +177,12 @@ Scripts may use the following functions and variables:
* args: Positional arguments left over after flags are processed.
+* runenv: The contents of $srctop/runenv.py, containing a dictionary
+ 'env' which specifies additional variables to be added to the realm
+ environment, and a variable 'proxy_tls_impl', which indicates which
+ SSL implementation (if any) is being used by libkrb5's support for
+ contacting KDCs and kpasswd servers over HTTPS.
+
* verbose: Whether the script is running verbosely.
* testpass: The command-line test pass argument. The script does not
@@ -526,9 +532,9 @@ def _match_cmdnum(cmdnum, ind):
# Return an environment suitable for running programs in the build
# tree. It is safe to modify the result.
def _build_env():
- global buildtop, _runenv
+ global buildtop, runenv
env = os.environ.copy()
- for (k, v) in _runenv.iteritems():
+ for (k, v) in runenv.env.iteritems():
if v.find('./') == 0:
env[k] = os.path.join(buildtop, v)
else:
@@ -544,8 +550,7 @@ def _import_runenv():
runenv_py = os.path.join(buildtop, 'runenv.py')
if not os.path.exists(runenv_py):
fail('You must run "make runenv.py" in %s first.' % buildtop)
- module = imp.load_source('runenv', runenv_py)
- return module.env
+ return imp.load_source('runenv', runenv_py)
# Merge the nested dictionaries cfg1 and cfg2 into a new dictionary.
@@ -1174,7 +1179,7 @@ _cmd_index = 1
buildtop = _find_buildtop()
srctop = _find_srctop()
plugins = os.path.join(buildtop, 'plugins')
-_runenv = _import_runenv()
+runenv = _import_runenv()
hostname = _get_hostname()
null_input = open(os.devnull, 'r')
--
2.1.0
|
