This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch master
in repository 389-ds-base.
The following commit(s) were added to refs/heads/master by this push:
new 2ce769e Ticket 49979 - Remove dirsrv tests subpackage
2ce769e is described below
commit 2ce769e4bc6b4eb8447ba13b45afc3cf1e8bc7e4
Author: Mark Reynolds <mreynolds(a)redhat.com>
AuthorDate: Mon Oct 15 15:07:21 2018 -0400
Ticket 49979 - Remove dirsrv tests subpackage
Description: Removed subpackage and cleaned up some compiler warnings
related to ticket 49915
https://pagure.io/389-ds-base/issue/49979
Reviewed by: mreynolds
---
Makefile.am | 7 ----
ldap/servers/plugins/acl/aclparse.c | 7 ++--
ldap/servers/slapd/back-ldbm/idl_new.c | 2 +-
ldap/servers/slapd/back-ldbm/index.c | 6 +--
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 2 +
rpm/389-ds-base.spec.in | 21 ----------
setup.py.in | 56 --------------------------
7 files changed, 10 insertions(+), 91 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index fffae13..417febc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -647,7 +647,6 @@ dist_noinst_DATA = \
$(srcdir)/LICENSE \
$(srcdir)/LICENSE.* \
$(srcdir)/VERSION.sh \
- $(srcdir)/setup.py.in \
$(srcdir)/wrappers/*.in \
$(srcdir)/wrappers/systemd.template.sysconfig \
$(srcdir)/dirsrvtests \
@@ -2379,12 +2378,6 @@ lib389: src/lib389/setup.py
lib389-install: lib389
cd $(srcdir)/src/lib389; $(PYTHON) setup.py install --skip-build --force
-tests: setup.py.in lib389
- $(PYTHON) setup.py build
-
-tests-install: tests
- $(PYTHON) setup.py install
-
# RPM-related tasks
RPMBUILD ?= $(abs_builddir)/rpmbuild
diff --git a/ldap/servers/plugins/acl/aclparse.c b/ldap/servers/plugins/acl/aclparse.c
index a425adb..2551d64 100644
--- a/ldap/servers/plugins/acl/aclparse.c
+++ b/ldap/servers/plugins/acl/aclparse.c
@@ -219,6 +219,7 @@ __aclp__parse_aci(char *str, aci_t *aci_item, char **errbuf)
char *tmpstr;
char *s = NULL;
char *value = NULL;
+ char *single_space = "";
Slapi_Filter *f = NULL;
int targetattrlen = strlen(aci_targetattr);
int targetdnlen = strlen(aci_targetdn);
@@ -262,7 +263,7 @@ __aclp__parse_aci(char *str, aci_t *aci_item, char **errbuf)
if ((s = strstr(str, "!=")) != NULL) {
type |= ACI_TARGET_ATTR_NOT;
- strncpy(s, " ", 1);
+ strncpy(s, single_space, 1);
}
/* Get individual components of the targetattr.
* (targetattr = "cn || u* || phone ||tel:add:(tel=1234)
@@ -344,7 +345,7 @@ __aclp__parse_aci(char *str, aci_t *aci_item, char **errbuf)
}
if ((s = strstr(str, "!=")) != NULL) {
type |= ACI_TARGET_NOT;
- strncpy(s, " ", 1);
+ strncpy(s, single_space, 1);
}
if ((s = strchr(str, '=')) != NULL) {
value = s + 1;
@@ -397,7 +398,7 @@ __aclp__parse_aci(char *str, aci_t *aci_item, char **errbuf)
}
if ((s = strstr(str, "!=")) != NULL) {
type |= ACI_TARGET_NOT;
- strncpy(s, " ", 1);
+ strncpy(s, single_space, 1);
}
if ((s = strchr(str, '=')) != NULL) {
value = s + 1;
diff --git a/ldap/servers/slapd/back-ldbm/idl_new.c
b/ldap/servers/slapd/back-ldbm/idl_new.c
index 9a7e78e..50c7ba4 100644
--- a/ldap/servers/slapd/back-ldbm/idl_new.c
+++ b/ldap/servers/slapd/back-ldbm/idl_new.c
@@ -379,7 +379,7 @@ idl_new_range_fetch(
bck_info.index = SLAPI_ATTR_PARENTID;
bck_info.key = "0";
- if (rc = slapi_back_get_info(be, BACK_INFO_INDEX_KEY, (void
**)&bck_info)) {
+ if ((rc = slapi_back_get_info(be, BACK_INFO_INDEX_KEY, (void
**)&bck_info))) {
slapi_log_err(SLAPI_LOG_WARNING, "idl_new_range_fetch",
"Total update: fail to retrieve suffix entryID, continue assuming it is the first
entry\n");
}
if (bck_info.key_found) {
diff --git a/ldap/servers/slapd/back-ldbm/index.c b/ldap/servers/slapd/back-ldbm/index.c
index dea6e9a..f0b969f 100644
--- a/ldap/servers/slapd/back-ldbm/index.c
+++ b/ldap/servers/slapd/back-ldbm/index.c
@@ -1262,7 +1262,7 @@ set_suffix_key(Slapi_Backend *be, struct _back_info_index_key
*info)
/* Start a txn */
li = (struct ldbminfo *)be->be_database->plg_private;
dblayer_txn_init(li, &txn);
- if (rc = dblayer_txn_begin(be, txn.back_txn_txn, &txn)) {
+ if ((rc = dblayer_txn_begin(be, txn.back_txn_txn, &txn))) {
slapi_log_err(SLAPI_LOG_ERR, "set_suffix_key", "Fail to update %s
index with %s/%d (key/ID): txn begin fails\n",
info->index, info->key, info->id);
return rc;
@@ -1272,7 +1272,7 @@ set_suffix_key(Slapi_Backend *be, struct _back_info_index_key
*info)
sv_key[1] = NULL;
slapi_value_init_string(sv_key[0], info->key);
- if (rc = index_addordel_values_sv(be, info->index, sv_key, NULL, info->id,
BE_INDEX_ADD, &txn)) {
+ if ((rc = index_addordel_values_sv(be, info->index, sv_key, NULL, info->id,
BE_INDEX_ADD, &txn))) {
value_done(sv_key[0]);
dblayer_txn_abort(be, &txn);
slapi_log_err(SLAPI_LOG_ERR, "set_suffix_key", "Fail to update %s
index with %s/%d (key/ID): index_addordel_values_sv fails\n",
@@ -1281,7 +1281,7 @@ set_suffix_key(Slapi_Backend *be, struct _back_info_index_key
*info)
}
value_done(sv_key[0]);
- if (rc = dblayer_txn_commit(be, &txn)) {
+ if ((rc = dblayer_txn_commit(be, &txn))) {
slapi_log_err(SLAPI_LOG_ERR, "set_suffix_key", "Fail to update %s
index with %s/%d (key/ID): commit fails\n",
info->index, info->key, info->id);
return rc;
diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
index f8b86d9..5749e26 100644
--- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -305,6 +305,8 @@ int index_buffer_init(size_t size, int flags, void **h);
int index_buffer_flush(void *h, backend *be, DB_TXN *txn, struct attrinfo *a);
int index_buffer_terminate(void *h);
+int get_suffix_key(Slapi_Backend *be, struct _back_info_index_key *info);
+int set_suffix_key(Slapi_Backend *be, struct _back_info_index_key *info);
char *index_index2prefix(const char *indextype);
void index_free_prefix(char *);
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index 8f7ba91..0756264 100644
--- a/rpm/389-ds-base.spec.in
+++ b/rpm/389-ds-base.spec.in
@@ -299,17 +299,6 @@ Requires: python%{python3_pkgversion}-argcomplete
This module contains tools and libraries for accessing, testing,
and configuring the 389 Directory Server.
-%package -n python%{python3_pkgversion}-%{srcname}-tests
-Summary: The lib389 Continuous Integration Tests
-Group: Development/Libraries
-BuildArch: noarch
-Requires: krb5-server
-Requires: python%{python3_pkgversion}
-Requires: python%{python3_pkgversion}-lib389
-
-%description -n python%{python3_pkgversion}-%{srcname}-tests
-The lib389 CI tests that can be run against the Directory Server.
-
%package -n cockpit-389-ds
Summary: Cockpit UI Plugin for configuring and administering the 389 Directory
Server
BuildArch: noarch
@@ -391,7 +380,6 @@ autoreconf -fiv
--enable-cmocka
%if 0%{?rhel} > 7 || 0%{?fedora}
-make setup.py
# lib389
pushd ./src/lib389
@@ -404,8 +392,6 @@ sed -i "1s/\"1\"/\"8\"/"
%{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/m
sed -i "1s/\"1\"/\"8\"/"
%{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dsidm.8
sed -i "1s/\"1\"/\"8\"/"
%{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dscreate.8
-# tests
-%py3_build
%endif
# Generate symbolic info for debuggers
@@ -433,8 +419,6 @@ pushd src/lib389
%py3_install
popd
-# tests
-%py3_install
%endif
mkdir -p $RPM_BUILD_ROOT/var/log/%{pkgname}
@@ -833,11 +817,6 @@ exit 0
%{_sbindir}/dsidm
%{_mandir}/man8/dsidm.8.gz
-%files -n python%{python3_pkgversion}-%{srcname}-tests
-%defattr(-,root,root,-)
-%doc LICENSE LICENSE.GPLv3+
-%{python3_sitelib}/dirsrvtests*
-
%files -n cockpit-389-ds -f cockpit.list
%defattr(-,root,root,-)
%doc README.md
diff --git a/setup.py.in b/setup.py.in
deleted file mode 100644
index 6954287..0000000
--- a/setup.py.in
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python
-
-# --- BEGIN COPYRIGHT BLOCK ---
-# Copyright (C) 2015 Red Hat, Inc.
-# All rights reserved.
-#
-# License: GPL (version 3 or any later version).
-# See LICENSE for details.
-# --- END COPYRIGHT BLOCK ---
-
-#
-# A setup.py file
-#
-
-from setuptools import setup, find_packages
-from os import path
-import subprocess
-
-here = path.abspath(path.dirname(__file__))
-
-version = "@RPM_VERSION@"
-
-long_description = """
-The 389 Directory Server test suites. These are used to assert the correct
-behaviour of the LDAP server and relevant standards. Many of these tests are
-related to correctness of features, isolation of bugs, stress testing, and
-other configurations.
-"""
-
-setup(
- name='dirsrvtests',
- license='GPLv3+',
- # How can we handle this better?
- version=version,
- description='The set of test suites for the 389 Directory Server',
- long_description=long_description,
-
url='http://port389.org/wiki/Upstream_test_framework';,
-
- author='Red Hat Inc.',
- author_email='389-devel(a)lists.fedoraproject.org',
-
- classifiers=[
- 'Development Status :: 4 - Beta',
- 'Intended Audience :: Developers',
- 'Operating System :: POSIX :: Linux',
- 'Programming Language :: Python :: 2.7',
- 'Topic :: Software Development :: Libraries',
- 'Topic :: Software Development :: Quality Assurance',
- 'Topic :: Software Development :: Testing'],
-
- keywords='389 directory server test configure',
- packages=find_packages(),
-
- install_requires=['python-ldap', 'lib389'],
-)
-
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.