Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 75AC4189F1 for ; Mon, 15 Feb 2016 20:57:38 +0000 (UTC) Received: (qmail 62129 invoked by uid 500); 15 Feb 2016 20:57:38 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 62083 invoked by uid 500); 15 Feb 2016 20:57:38 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 62074 invoked by uid 99); 15 Feb 2016 20:57:38 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Feb 2016 20:57:38 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id EDCC2C0D9B for ; Mon, 15 Feb 2016 20:57:37 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.471 X-Spam-Level: * X-Spam-Status: No, score=1.471 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id oQAf_YW7Fm3u for ; Mon, 15 Feb 2016 20:57:36 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id A76555FE27 for ; Mon, 15 Feb 2016 20:57:35 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id EC9B9E0097 for ; Mon, 15 Feb 2016 20:57:34 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id D34323A10A5 for ; Mon, 15 Feb 2016 20:57:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1730610 - in /directory/apacheds/trunk/installers/src/test/docker: archive.test bin.test deb.test rpm.test Date: Mon, 15 Feb 2016 20:57:34 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160215205734.D34323A10A5@svn01-us-west.apache.org> Author: seelmann Date: Mon Feb 15 20:57:34 2016 New Revision: 1730610 URL: http://svn.apache.org/viewvc?rev=1730610&view=rev Log: DIRSERVER-2120: Add assertions about exit status to installer 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/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=1730610&r1=1730609&r2=1730610&view=diff ============================================================================== --- directory/apacheds/trunk/installers/src/test/docker/archive.test (original) +++ directory/apacheds/trunk/installers/src/test/docker/archive.test Mon Feb 15 20:57:34 2016 @@ -63,13 +63,12 @@ test -f /opt/${DIRNAME}/bin/apacheds.sh test -x /opt/${DIRNAME}/bin/apacheds.sh test -d /opt/${DIRNAME}/instances/default -# assert not running +# assert not running: output and exit status if [ $HAVE_TTY -eq 1 ] then /opt/${DIRNAME}/bin/apacheds.sh status | grep "ApacheDS is not running" -else - ! /opt/${DIRNAME}/bin/apacheds.sh status fi +/opt/${DIRNAME}/bin/apacheds.sh status || test $? -ne 0 # install required tools apt-get -qq update @@ -79,13 +78,12 @@ apt-get -qq -y install ldap-utils netcat /opt/${DIRNAME}/bin/apacheds.sh start wait_for_apacheds_up -# assert running +# assert running: output and exit status if [ $HAVE_TTY -eq 1 ] then /opt/${DIRNAME}/bin/apacheds.sh status | grep "ApacheDS is running" -else - /opt/${DIRNAME}/bin/apacheds.sh status fi +/opt/${DIRNAME}/bin/apacheds.sh 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" @@ -104,13 +102,12 @@ done /opt/${DIRNAME}/bin/apacheds.sh stop wait_for_apacheds_down -# assert not running +# assert not running: output and exit status if [ $HAVE_TTY -eq 1 ] then /opt/${DIRNAME}/bin/apacheds.sh status | grep "ApacheDS is not running" -else - ! /opt/${DIRNAME}/bin/apacheds.sh status fi +/opt/${DIRNAME}/bin/apacheds.sh status || test $? -ne 0 # assert password warning in log grep ".*WARN.*admin password.*security breach.*" /opt/${DIRNAME}/instances/default/log/apacheds.log 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=1730610&r1=1730609&r2=1730610&view=diff ============================================================================== --- directory/apacheds/trunk/installers/src/test/docker/bin.test (original) +++ directory/apacheds/trunk/installers/src/test/docker/bin.test Mon Feb 15 20:57:34 2016 @@ -55,19 +55,22 @@ test -f /opt/${DIRNAME}/LICENSE test -f /opt/${DIRNAME}/NOTICE test -d /var/lib/${DIRNAME}/default -# assert not running +# assert not running: output and exit status service ${SERVICE_NAME} status | grep "ApacheDS - default is not running" +service ${SERVICE_NAME} status || test $? -ne 0 # install ldapsearch and tools apt-get -qq update apt-get -qq -y install ldap-utils netcat # start -service ${SERVICE_NAME} start +service ${SERVICE_NAME} start wait_for_apacheds -# assert running +# assert running: output and exit status 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" @@ -75,7 +78,7 @@ ldapsearch -h localhost -p 10389 -x -D " # restart and search a few times for i in 1 2 3 do - service ${SERVICE_NAME} restart + service ${SERVICE_NAME} restart wait_for_apacheds ldapsearch -h localhost -p 10389 -x -D "uid=admin,ou=system" -w secret -s base -b "dc=example,dc=com" done @@ -83,8 +86,9 @@ done # stop service ${SERVICE_NAME} stop -# assert not running +# assert not running: output and exit status service ${SERVICE_NAME} status | grep "ApacheDS - default is not running" +service ${SERVICE_NAME} status || test $? -ne 0 # assert password warning in log grep ".*WARN.*admin password.*security breach.*" /var/lib/${DIRNAME}/default/log/apacheds.log 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=1730610&r1=1730609&r2=1730610&view=diff ============================================================================== --- directory/apacheds/trunk/installers/src/test/docker/deb.test (original) +++ directory/apacheds/trunk/installers/src/test/docker/deb.test Mon Feb 15 20:57:34 2016 @@ -46,19 +46,21 @@ test -f /opt/${DIRNAME}/LICENSE test -f /opt/${DIRNAME}/NOTICE test -d /var/lib/${DIRNAME}/default -# assert not running +# assert not running: output and exit status service ${SERVICE_NAME} status | grep "ApacheDS - default is not running" +service ${SERVICE_NAME} status || test $? -ne 0 # install required tools apt-get -qq update apt-get -qq -y install ldap-utils netcat # start -service ${SERVICE_NAME} start +service ${SERVICE_NAME} start wait_for_apacheds -# assert running +# assert running: output and exit status 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" @@ -66,7 +68,7 @@ ldapsearch -h localhost -p 10389 -x -D " # restart and search a few times for i in 1 2 3 do - service ${SERVICE_NAME} restart + service ${SERVICE_NAME} restart wait_for_apacheds ldapsearch -h localhost -p 10389 -x -D "uid=admin,ou=system" -w secret -s base -b "dc=example,dc=com" done @@ -74,8 +76,9 @@ done # stop service ${SERVICE_NAME} stop -# assert not running +# assert not running: output and exit status service ${SERVICE_NAME} status | grep "ApacheDS - default is not running" +service ${SERVICE_NAME} status || test $? -ne 0 # assert password warning in log grep ".*WARN.*admin password.*security breach.*" /var/lib/${DIRNAME}/default/log/apacheds.log 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=1730610&r1=1730609&r2=1730610&view=diff ============================================================================== --- directory/apacheds/trunk/installers/src/test/docker/rpm.test (original) +++ directory/apacheds/trunk/installers/src/test/docker/rpm.test Mon Feb 15 20:57:34 2016 @@ -56,15 +56,17 @@ test -f /opt/${DIRNAME}/LICENSE test -f /opt/${DIRNAME}/NOTICE test -d /var/lib/${DIRNAME}/default -# assert not running +# assert not running: output and exit status /etc/init.d/${SERVICE_NAME} status | grep "ApacheDS - default is not running" +/etc/init.d/${SERVICE_NAME} status || test $? -ne 0 # start -/etc/init.d/${SERVICE_NAME} start +/etc/init.d/${SERVICE_NAME} start wait_for_apacheds -# assert running +# assert running: output and exit status /etc/init.d/${SERVICE_NAME} status | grep "ApacheDS - default is running" +/etc/init.d/${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" @@ -72,7 +74,7 @@ ldapsearch -h localhost -p 10389 -x -D " # restart and search a few times for i in 1 2 3 do - /etc/init.d/${SERVICE_NAME} restart + /etc/init.d/${SERVICE_NAME} restart wait_for_apacheds ldapsearch -h localhost -p 10389 -x -D "uid=admin,ou=system" -w secret -s base -b "dc=example,dc=com" done @@ -80,8 +82,9 @@ done # stop /etc/init.d/${SERVICE_NAME} stop -# assert not running +# assert not running: output and exit status /etc/init.d/${SERVICE_NAME} status | grep "ApacheDS - default is not running" +/etc/init.d/${SERVICE_NAME} status || test $? -ne 0 # assert password warning in log grep ".*WARN.*admin password.*security breach.*" /var/lib/${DIRNAME}/default/log/apacheds.log