author | John Beck <John.Beck@Oracle.COM> |
Wed, 09 Oct 2013 07:10:15 -0700 | |
branch | s11-update |
changeset 2785 | b6f5c5d1d0b7 |
child 6437 | 09fb2c712a39 |
permissions | -rw-r--r-- |
2785
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
1 |
Changes from Doug Leavitt needed to make "gmake test" work. |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
2 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
3 |
Two tests are known to fail. |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
4 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
5 |
Commentary from Doug: |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
6 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
7 |
The two test cases that failed are not critical. |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
8 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
9 |
One fails because it says the library does not throw a value error on a |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
10 |
bad URL. This one fails, as the bad url it is trying is an edge case: |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
11 |
ldap:///????? and not that important. |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
12 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
13 |
The other failure is for a test case that has a comment before the test case: |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
14 |
# these two constants are pointless? XXX |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
15 |
The answer being yes. And the constants are not defined in the latest |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
16 |
version of python-ldap. |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
17 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
18 |
--- python-ldap-2.4.10/Tests/runtests.sh.orig 2013-08-27 06:55:02.811070599 -0700 |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
19 |
+++ python-ldap-2.4.10/Tests/runtests.sh 2013-08-29 14:08:44.244509377 -0700 |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
20 |
@@ -13,7 +13,7 @@ |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
21 |
failed= |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
22 |
for test in t_*.py; do |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
23 |
echo "$test:" |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
24 |
- PYTHONPATH="../build/lib.$plat_specifier" $PYTHON "$test" "$@" || |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
25 |
+ PYTHONPATH="$PYTHONPATH" $PYTHON "$test" "$@" || |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
26 |
failed="$failed $test" |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
27 |
done |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
28 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
29 |
--- python-ldap-2.4.10/Tests/slapd.py.orig 2013-08-27 06:55:17.348745615 -0700 |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
30 |
+++ python-ldap-2.4.10/Tests/slapd.py 2013-08-30 15:45:41.532814947 -0700 |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
31 |
@@ -4,7 +4,7 @@ |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
32 |
and talking to it with ldapsearch/ldapadd. |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
33 |
""" |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
34 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
35 |
-import sys, os, socket, time, subprocess, logging |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
36 |
+import sys, os, socket, time, subprocess, logging, tempfile |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
37 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
38 |
_log = logging.getLogger("slapd") |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
39 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
40 |
@@ -52,14 +52,20 @@ |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
41 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
42 |
_log = logging.getLogger("Slapd") |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
43 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
44 |
- # Use /var/tmp to placate apparmour on Ubuntu: |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
45 |
- PATH_TMPDIR = "/var/tmp/python-ldap-test" |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
46 |
+ # Try to create a unique temporary directory under the component build |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
47 |
+ # directory, so it can automatically cleaned up. |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
48 |
+ PATH_BUILDDIR = os.environ['BUILD_DIR'] |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
49 |
+ if PATH_BUILDDIR: |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
50 |
+ PATH_TMPDIR = tempfile.mkdtemp(prefix=PATH_BUILDDIR) |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
51 |
+ else: |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
52 |
+ PATH_TMPDIR = "/tmp" |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
53 |
+ PATH_LIBDIR = "/usr/lib" |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
54 |
PATH_SBINDIR = "/usr/sbin" |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
55 |
PATH_BINDIR = "/usr/bin" |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
56 |
- PATH_SCHEMA_CORE = "/etc/ldap/schema/core.schema" |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
57 |
- PATH_LDAPADD = os.path.join(PATH_BINDIR, "ldapadd") |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
58 |
- PATH_LDAPSEARCH = os.path.join(PATH_BINDIR, "ldapsearch") |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
59 |
- PATH_SLAPD = os.path.join(PATH_SBINDIR, "slapd") |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
60 |
+ PATH_SCHEMA_CORE = "/etc/openldap/schema/core.schema" |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
61 |
+ PATH_LDAPADD = os.path.join(PATH_BINDIR, "openldapadd") |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
62 |
+ PATH_LDAPSEARCH = os.path.join(PATH_BINDIR, "openldapsearch") |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
63 |
+ PATH_SLAPD = os.path.join(PATH_LIBDIR, "slapd") |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
64 |
PATH_SLAPTEST = os.path.join(PATH_SBINDIR, "slaptest") |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
65 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
66 |
# TODO add paths for other OSs |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
67 |
@@ -266,6 +272,7 @@ |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
68 |
"""Runs ldapadd on this slapd instance, passing it the ldif content""" |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
69 |
self._log.debug("adding %s", repr(ldif)) |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
70 |
p = subprocess.Popen([self.PATH_LDAPADD, |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
71 |
+ "-a", |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
72 |
"-x", |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
73 |
"-D", self.get_root_dn(), |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
74 |
"-w", self.get_root_password(), |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
75 |
--- python-ldap-2.4.10/Tests/t_cext.py.orig 2013-08-27 06:55:30.369505885 -0700 |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
76 |
+++ python-ldap-2.4.10/Tests/t_cext.py 2013-09-04 10:39:22.688268552 -0700 |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
77 |
@@ -1,6 +1,6 @@ |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
78 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
79 |
import unittest, slapd |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
80 |
-import _ldap |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
81 |
+import _ldap, ldap |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
82 |
import logging |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
83 |
|
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
84 |
reusable_server = None |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
85 |
@@ -34,7 +34,7 @@ |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
86 |
def _init(self, reuse_existing=True, bind=True): |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
87 |
"""Starts a server, and returns a LDAPObject bound to it""" |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
88 |
server = self._init_server(reuse_existing) |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
89 |
- l = _ldap.initialize(server.get_url()) |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
90 |
+ l = ldap.initialize(server.get_url()) |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
91 |
if bind: |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
92 |
# Perform a simple bind |
b6f5c5d1d0b7
PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
93 |
l.set_option(_ldap.OPT_PROTOCOL_VERSION, _ldap.VERSION3) |