From patchwork Sun Aug 2 23:58:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 38815 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n72Nt15l009582 for ; Sun, 2 Aug 2009 23:55:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754010AbZHBXy7 (ORCPT ); Sun, 2 Aug 2009 19:54:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753978AbZHBXy7 (ORCPT ); Sun, 2 Aug 2009 19:54:59 -0400 Received: from mx2.redhat.com ([66.187.237.31]:37223 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753985AbZHBXy5 (ORCPT ); Sun, 2 Aug 2009 19:54:57 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n72Ns9qi016660; Sun, 2 Aug 2009 19:54:17 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n72Nrt4t022176; Sun, 2 Aug 2009 19:53:55 -0400 Received: from localhost.localdomain (dhcp-1-188.tlv.redhat.com [10.35.1.188]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n72Nre6Q017975; Sun, 2 Aug 2009 19:53:54 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 10/12] KVM test: kvm_utils.py: small fix for format_str_for_message() Date: Mon, 3 Aug 2009 02:58:19 +0300 Message-Id: <9d3f23dc691330c08a1aa0e90455ffaac645777f.1249257056.git.mgoldish@redhat.com> In-Reply-To: References: <1249257501-19337-1-git-send-email-mgoldish@redhat.com> <7845d2fd228ec0232af10e48dbb29e1076a265d6.1249257056.git.mgoldish@redhat.com> <9ec0626f3ca8c20d08cfd2448dbf249632ed969a.1249257056.git.mgoldish@redhat.com> <30ddf2ae0b04eb29d55dcece97fd956b75563045.1249257056.git.mgoldish@redhat.com> <3e87b54663c4483d10912231945fc37741087b8f.1249257056.git.mgoldish@redhat.com> <9d4ca96f1445db6df176825a494d6504a3bddeba.1249257056.git.mgoldish@redhat.com> <8a2d08b846334a5eb097c2f32348d0c04a6789fb.1249257056.git.mgoldish@redhat.com> <603d8e9011205d1586b36dffead3823a2a61a745.1249257056.git.mgoldish@redhat.com> In-Reply-To: <7845d2fd228ec0232af10e48dbb29e1076a265d6.1249257056.git.mgoldish@redhat.com> References: <7845d2fd228ec0232af10e48dbb29e1076a265d6.1249257056.git.mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org format_str_for_message() sometimes adds an extra newline. Fix that. Signed-off-by: Michael Goldish --- client/tests/kvm/kvm_utils.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/client/tests/kvm/kvm_utils.py b/client/tests/kvm/kvm_utils.py index 5d8291f..1c11fa4 100644 --- a/client/tests/kvm/kvm_utils.py +++ b/client/tests/kvm/kvm_utils.py @@ -654,7 +654,9 @@ def format_str_for_message(str): @param str: string that will be formatted. """ - num_lines = len(str.splitlines()) + lines = str.splitlines() + num_lines = len(lines) + str = "\n".join(lines) if num_lines == 0: return "" elif num_lines == 1: