From patchwork Wed Aug 12 16:00:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 40913 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 n7CFwLLX005478 for ; Wed, 12 Aug 2009 15:58:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754050AbZHLP5b (ORCPT ); Wed, 12 Aug 2009 11:57:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754036AbZHLP5a (ORCPT ); Wed, 12 Aug 2009 11:57:30 -0400 Received: from mx2.redhat.com ([66.187.237.31]:42772 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754024AbZHLP53 (ORCPT ); Wed, 12 Aug 2009 11:57:29 -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 n7CFvUHI005580; Wed, 12 Aug 2009 11:57:30 -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 n7CFvTU6004577; Wed, 12 Aug 2009 11:57:29 -0400 Received: from localhost.localdomain (dhcp-1-31.tlv.redhat.com [10.35.1.31]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7CFvFCL029667; Wed, 12 Aug 2009 11:57:28 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH v2 09/11] KVM test: kvm_utils.py: small fix for format_str_for_message() Date: Wed, 12 Aug 2009 19:00:01 +0300 Message-Id: <71ae342fd706695b8670fe549b7aa7222a284586.1250091576.git.mgoldish@redhat.com> In-Reply-To: References: <1250092803-32477-1-git-send-email-mgoldish@redhat.com> <10a541e518180735e86a4dbc8e759912d0ec314c.1250091576.git.mgoldish@redhat.com> <42ceeed70c7c1ec9f4d78d91d67a290f3ac11e6e.1250091576.git.mgoldish@redhat.com> <8284ff0173612b63412132bb8c864f2c8a258b55.1250091576.git.mgoldish@redhat.com> <05eac6f84757616309273b01ac4d8800efbdb083.1250091576.git.mgoldish@redhat.com> <5fbc30f0d24e3d4b12b93f40fe14264e5963048c.1250091576.git.mgoldish@redhat.com> <40e596a8c1d099f0afdd2ad18f2f4a0908b89f20.1250091576.git.mgoldish@redhat.com> In-Reply-To: <10a541e518180735e86a4dbc8e759912d0ec314c.1250091576.git.mgoldish@redhat.com> References: <10a541e518180735e86a4dbc8e759912d0ec314c.1250091576.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 4891592..ef257bc 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: