Merge pull request #26204 from layus/fix-python-ldap

python-ldap: fixup tests for 2.4.38 update
This commit is contained in:
Frederik Rietdijk 2017-05-29 12:41:12 +02:00 committed by GitHub
commit 595141d710

@ -1,4 +1,4 @@
{ buildPythonPackage, isPy3k, fetchPypi { lib, writeText, buildPythonPackage, isPy3k, fetchPypi
, openldap, cyrus_sasl, openssl }: , openldap, cyrus_sasl, openssl }:
buildPythonPackage rec { buildPythonPackage rec {
@ -12,6 +12,28 @@ buildPythonPackage rec {
sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779"; sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779";
}; };
# Needed by tests to setup a mockup ldap server.
BIN = "${openldap}/bin";
SBIN = "${openldap}/bin";
SLAPD = "${openldap}/libexec/slapd";
SCHEMA = "${openldap}/etc/schema";
patches = lib.singleton (writeText "avoid-syslog.diff" ''
diff a/Lib/slapdtest.py b/Lib/slapdtest.py
--- a/Lib/slapdtest.py
+++ b/Lib/slapdtest.py
@@ -60,7 +60,8 @@ def combined_logger(
pass
# for writing to syslog
new_logger = logging.getLogger(log_name)
- if sys_log_format:
+ # /dev/log does not exist in nix build environment.
+ if False:
my_syslog_formatter = logging.Formatter(
fmt=' '.join((log_name, sys_log_format)))
my_syslog_handler = logging.handlers.SysLogHandler(
'');
NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl"; NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl";
propagatedBuildInputs = [openldap cyrus_sasl openssl]; propagatedBuildInputs = [openldap cyrus_sasl openssl];
} }