Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B7DA3D88C for ; Mon, 18 Mar 2013 17:39:29 +0000 (UTC) Received: (qmail 16307 invoked by uid 500); 18 Mar 2013 17:39:29 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 16266 invoked by uid 500); 18 Mar 2013 17:39:29 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 16233 invoked by uid 99); 18 Mar 2013 17:39:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2013 17:39:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C10423901D; Mon, 18 Mar 2013 17:39:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ihabunek@apache.org To: commits@logging.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Minor fix for MongoDB tests Message-Id: <20130318173928.C10423901D@tyr.zones.apache.org> Date: Mon, 18 Mar 2013 17:39:28 +0000 (UTC) Updated Branches: refs/heads/develop daf50b467 -> 1b2d8801a Minor fix for MongoDB tests Made tearDown() check for the mongodb extension as well as setUp() otherwise the tests would fail if extension was not loaded, instead of being skipped. Signed-off-by: Ivan Habunek Project: http://git-wip-us.apache.org/repos/asf/logging-log4php/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4php/commit/1b2d8801 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4php/tree/1b2d8801 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4php/diff/1b2d8801 Branch: refs/heads/develop Commit: 1b2d8801af44c23963b4bcc5cf8afcb88d2c4ad2 Parents: f6d602f Author: Ivan Habunek Authored: Mon Mar 18 18:37:40 2013 +0100 Committer: Ivan Habunek Committed: Mon Mar 18 18:37:40 2013 +0100 ---------------------------------------------------------------------- .../php/appenders/LoggerAppenderMongoDBTest.php | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/1b2d8801/src/test/php/appenders/LoggerAppenderMongoDBTest.php ---------------------------------------------------------------------- diff --git a/src/test/php/appenders/LoggerAppenderMongoDBTest.php b/src/test/php/appenders/LoggerAppenderMongoDBTest.php index 3be6c9c..7bdf0f2 100644 --- a/src/test/php/appenders/LoggerAppenderMongoDBTest.php +++ b/src/test/php/appenders/LoggerAppenderMongoDBTest.php @@ -48,9 +48,11 @@ class LoggerAppenderMongoDBTest extends PHPUnit_Framework_TestCase { } protected function tearDown() { - $collection = $this->appender->getCollection(); - if ($collection !== null) { - $collection->drop(); + if (extension_loaded('Mongo')) { + $collection = $this->appender->getCollection(); + if ($collection !== null) { + $collection->drop(); + } } unset($this->appender); }