From patchwork Thu May 10 08:59:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 158227 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3D6DCB6FB4 for ; Thu, 10 May 2012 19:00:02 +1000 (EST) Received: from localhost ([::1]:50843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSPE8-0000hK-4K for incoming@patchwork.ozlabs.org; Thu, 10 May 2012 05:00:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSPDv-0000gz-4r for qemu-devel@nongnu.org; Thu, 10 May 2012 04:59:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSPDq-0007My-Ef for qemu-devel@nongnu.org; Thu, 10 May 2012 04:59:46 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:64352) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSPDq-0007MX-63 for qemu-devel@nongnu.org; Thu, 10 May 2012 04:59:42 -0400 Received: by pbbro12 with SMTP id ro12so2205936pbb.4 for ; Thu, 10 May 2012 01:59:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=OxFgcUs7k2yuPpokvDXl8GVce6lCUqp5i6SSEGoH1VY=; b=NECiSKWBSM8cXVyba9tBJ7IubTxu6MdiYqIDYdwZyEKoxNYtfPum6ij4NJD1dMZwVN zyb1iaKK9HfhISeRuBB86uUQsR0U1axjOTgiWdV9gctq2ERGpDUaVJDtePBJPUikkm6i 7WuuaRKcCT3S9AFvvCW4z3i83eCgXoccZeur3teg5VesQv+SScN6ABWGgFoy5Z5K3+4M bmXhwtmUDwcoEuk4H3pfy6VYsL1PUBoCWfyFMbVcrePbmg5/nWMRGfZ51Jqt6PSadVrW yZMs5Krz7qHQb0XaP915tj6wGOSm/Ji9l/IUm2KQHyR0GEgG8V5WdilvnjusJIWycP26 8zkA== Received: by 10.68.228.195 with SMTP id sk3mr6086381pbc.20.1336640379822; Thu, 10 May 2012 01:59:39 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-182-16.ip50.fastwebnet.it. [93.34.182.16]) by mx.google.com with ESMTPS id pu10sm8909214pbc.57.2012.05.10.01.59.37 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 10 May 2012 01:59:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 10 May 2012 10:59:29 +0200 Message-Id: <1336640369-13698-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH] block: fix qemu-iotests 030 failure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- These hunks were left out of "stream: add testcase for partial streaming" v2 due a bad rebase on my side (I added the os.remove on top of an old branch rather than the latest). Please squash them in, sorry for the problem. tests/qemu-iotests/030 | 2 +- tests/qemu-iotests/030.out | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 12e5023..eb7bf99 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -90,7 +90,7 @@ class TestSingleDrive(ImageStreamingTestCase): def test_stream_partial(self): self.assert_no_active_streams() - result = self.vm.qmp('block_stream', device='drive0', base=mid_img) + result = self.vm.qmp('block-stream', device='drive0', base=mid_img) self.assert_qmp(result, 'return', {}) completed = False diff --git a/tests/qemu-iotests/030.out b/tests/qemu-iotests/030.out index 914e373..3f8a935 100644 --- a/tests/qemu-iotests/030.out +++ b/tests/qemu-iotests/030.out @@ -1,5 +1,5 @@ -..... +...... ---------------------------------------------------------------------- -Ran 5 tests +Ran 6 tests OK