You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2017/04/02 16:58:58 UTC
svn commit: r1789898 - in
/directory/apacheds/trunk/installers/src/test/docker: archive.test bin.test
bin2.test deb.test rpm.test
Author: seelmann
Date: Sun Apr 2 16:58:58 2017
New Revision: 1789898
URL: http://svn.apache.org/viewvc?rev=1789898&view=rev
Log:
DIRSERVER-2186: Fix repair command
* Adapt docker tests
Modified:
directory/apacheds/trunk/installers/src/test/docker/archive.test
directory/apacheds/trunk/installers/src/test/docker/bin.test
directory/apacheds/trunk/installers/src/test/docker/bin2.test
directory/apacheds/trunk/installers/src/test/docker/deb.test
directory/apacheds/trunk/installers/src/test/docker/rpm.test
Modified: directory/apacheds/trunk/installers/src/test/docker/archive.test
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers/src/test/docker/archive.test?rev=1789898&r1=1789897&r2=1789898&view=diff
==============================================================================
--- directory/apacheds/trunk/installers/src/test/docker/archive.test (original)
+++ directory/apacheds/trunk/installers/src/test/docker/archive.test Sun Apr 2 16:58:58 2017
@@ -88,6 +88,16 @@ fi
# search
ldapsearch -h localhost -p 10389 -x -D "uid=admin,ou=system" -w secret -s base -b "dc=example,dc=com"
+# repair (stop before, should be started afterwards)
+/opt/${DIRNAME}/bin/apacheds.sh stop
+wait_for_apacheds_down
+/opt/${DIRNAME}/bin/apacheds.sh repair
+wait_for_apacheds_up
+if [ $HAVE_TTY -eq 1 ]
+then
+ /opt/${DIRNAME}/bin/apacheds.sh status | grep "ApacheDS is running"
+fi
+
# restart and search a few times
for i in 1 2 3
do
Modified: directory/apacheds/trunk/installers/src/test/docker/bin.test
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers/src/test/docker/bin.test?rev=1789898&r1=1789897&r2=1789898&view=diff
==============================================================================
--- directory/apacheds/trunk/installers/src/test/docker/bin.test (original)
+++ directory/apacheds/trunk/installers/src/test/docker/bin.test Sun Apr 2 16:58:58 2017
@@ -71,10 +71,16 @@ wait_for_apacheds
service ${SERVICE_NAME} status | grep "ApacheDS - default is running"
service ${SERVICE_NAME} status && test $? -eq 0
-
# search
ldapsearch -h localhost -p 10389 -x -D "uid=admin,ou=system" -w secret -s base -b "dc=example,dc=com"
+# repair (stop before, should be started afterwards)
+service ${SERVICE_NAME} stop
+service ${SERVICE_NAME} repair
+wait_for_apacheds
+service ${SERVICE_NAME} status | grep "ApacheDS - default is running"
+service ${SERVICE_NAME} status && test $? -eq 0
+
# restart and search a few times
for i in 1 2 3
do
Modified: directory/apacheds/trunk/installers/src/test/docker/bin2.test
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers/src/test/docker/bin2.test?rev=1789898&r1=1789897&r2=1789898&view=diff
==============================================================================
--- directory/apacheds/trunk/installers/src/test/docker/bin2.test (original)
+++ directory/apacheds/trunk/installers/src/test/docker/bin2.test Sun Apr 2 16:58:58 2017
@@ -72,10 +72,16 @@ wait_for_apacheds
service ${SERVICE_NAME} status | grep "ApacheDS - default is running"
service ${SERVICE_NAME} status && test $? -eq 0
-
# search
ldapsearch -h localhost -p 10389 -x -D "uid=admin,ou=system" -w secret -s base -b "dc=example,dc=com"
+# repair (stop before, should be started afterwards)
+service ${SERVICE_NAME} stop
+service ${SERVICE_NAME} repair
+wait_for_apacheds
+service ${SERVICE_NAME} status | grep "ApacheDS - default is running"
+service ${SERVICE_NAME} status && test $? -eq 0
+
# restart and search a few times
for i in 1 2 3
do
Modified: directory/apacheds/trunk/installers/src/test/docker/deb.test
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers/src/test/docker/deb.test?rev=1789898&r1=1789897&r2=1789898&view=diff
==============================================================================
--- directory/apacheds/trunk/installers/src/test/docker/deb.test (original)
+++ directory/apacheds/trunk/installers/src/test/docker/deb.test Sun Apr 2 16:58:58 2017
@@ -65,6 +65,13 @@ service ${SERVICE_NAME} status && test $
# search
ldapsearch -h localhost -p 10389 -x -D "uid=admin,ou=system" -w secret -s base -b "dc=example,dc=com"
+# repair (stop before and start after)
+service ${SERVICE_NAME} stop
+service ${SERVICE_NAME} repair
+wait_for_apacheds
+service ${SERVICE_NAME} status | grep "ApacheDS - default is running"
+service ${SERVICE_NAME} status && test $? -eq 0
+
# restart and search a few times
for i in 1 2 3
do
Modified: directory/apacheds/trunk/installers/src/test/docker/rpm.test
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers/src/test/docker/rpm.test?rev=1789898&r1=1789897&r2=1789898&view=diff
==============================================================================
--- directory/apacheds/trunk/installers/src/test/docker/rpm.test (original)
+++ directory/apacheds/trunk/installers/src/test/docker/rpm.test Sun Apr 2 16:58:58 2017
@@ -71,6 +71,13 @@ wait_for_apacheds
# search
ldapsearch -h localhost -p 10389 -x -D "uid=admin,ou=system" -w secret -s base -b "dc=example,dc=com"
+# repair (stop before and start after)
+/etc/init.d/${SERVICE_NAME} stop
+/etc/init.d/${SERVICE_NAME} repair
+wait_for_apacheds
+/etc/init.d/${SERVICE_NAME} status | grep "ApacheDS - default is running"
+/etc/init.d/${SERVICE_NAME} status && test $? -eq 0
+
# restart and search a few times
for i in 1 2 3
do