From commits-return-28738-apmail-qpid-commits-archive=qpid.apache.org@qpid.apache.org Tue Apr 7 19:35:03 2015 Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-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 9CB9717ED4 for ; Tue, 7 Apr 2015 19:35:03 +0000 (UTC) Received: (qmail 83421 invoked by uid 500); 7 Apr 2015 19:35:03 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 83399 invoked by uid 500); 7 Apr 2015 19:35:03 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 83390 invoked by uid 99); 7 Apr 2015 19:35:03 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Apr 2015 19:35:03 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 5FD4DAC00B4 for ; Tue, 7 Apr 2015 19:35:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1671930 - in /qpid/dispatch/trunk: tests/system_tests_qdstat.py tools/qdstat Date: Tue, 07 Apr 2015 19:35:03 -0000 To: commits@qpid.apache.org From: kgiusti@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150407193503.5FD4DAC00B4@hades.apache.org> Author: kgiusti Date: Tue Apr 7 19:35:02 2015 New Revision: 1671930 URL: http://svn.apache.org/r1671930 Log: NO-JIRA: fix unit test failure when memory pools are disabled Modified: qpid/dispatch/trunk/tests/system_tests_qdstat.py qpid/dispatch/trunk/tools/qdstat Modified: qpid/dispatch/trunk/tests/system_tests_qdstat.py URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_qdstat.py?rev=1671930&r1=1671929&r2=1671930&view=diff ============================================================================== --- qpid/dispatch/trunk/tests/system_tests_qdstat.py (original) +++ qpid/dispatch/trunk/tests/system_tests_qdstat.py Tue Apr 7 19:35:02 2015 @@ -63,7 +63,12 @@ class QdstatTest(system_test.TestCase): self.run_qdstat(['--address'], r'\$management') def test_memory(self): - self.run_qdstat(['--memory'], r'qd_address_t\s+[0-9]+') + out = self.run_qdstat(['--memory']) + if out.strip() == "No memory statistics available": + # router built w/o memory pools enabled] + self.skipTest("Router's memory pools disabled") + regexp = r'qd_address_t\s+[0-9]+' + assert re.search(regexp, out, re.I), "Can't find '%s' in '%s'" % (regexp, out) def test_log(self): self.run_qdstat(['--log', '--limit=5'], r'AGENT \(trace\).*GET-LOG') Modified: qpid/dispatch/trunk/tools/qdstat URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tools/qdstat?rev=1671930&r1=1671929&r2=1671930&view=diff ============================================================================== --- qpid/dispatch/trunk/tools/qdstat (original) +++ qpid/dispatch/trunk/tools/qdstat Tue Apr 7 19:35:02 2015 @@ -282,6 +282,10 @@ class BusManager(Node): row.append(t.batchesRebalancedToThreads) row.append(t.batchesRebalancedToGlobal) rows.append(row) + if not rows: + # router built w/o memory pools: + print "No memory statistics available" + return title = "Types" sorter = Sorter(heads, rows, 'type', 0, True) dispRows = sorter.getSorted() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org