From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 569C2C35247 for ; Thu, 6 Feb 2020 21:37:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1CD4C21775 for ; Thu, 6 Feb 2020 21:37:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OnacaPRD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CD4C21775 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izopY-0005F1-A1 for qemu-devel@archiver.kernel.org; Thu, 06 Feb 2020 16:37:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34718) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izoaW-0000Pw-HC for qemu-devel@nongnu.org; Thu, 06 Feb 2020 16:21:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izoaV-0005eE-EB for qemu-devel@nongnu.org; Thu, 06 Feb 2020 16:21:28 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:58844 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1izoaV-0005cp-A1 for qemu-devel@nongnu.org; Thu, 06 Feb 2020 16:21:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581024087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wG4Wm9r/QjpdERTkmu9ftEh0PSVsE5MTwObgPh3gWIY=; b=OnacaPRDw26nRlejYlkDrE4/CthcWU+jr8sYoC9CidY8X6H6YeOEJoqtxYmP4Q0BRrMZi9 Du36JeUitC3nj+SMAQgdx128gFkdnVLaMXqtGnJoeV8lnwkkcFPppBPAAJrg9678ft0CFl RiAnY7dzDLecy+X2Tm9cp05/J3ISkSY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-64-Xfr2Tm7nO5mWkjt3XXWheg-1; Thu, 06 Feb 2020 16:21:22 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 04ACE1050442 for ; Thu, 6 Feb 2020 21:21:22 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-120.brq.redhat.com [10.40.204.120]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 74B6260BEC; Thu, 6 Feb 2020 21:21:20 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 26/46] tests/acceptance/migration: Factor out do_migrate() Date: Thu, 6 Feb 2020 22:19:16 +0100 Message-Id: <20200206211936.17098-27-philmd@redhat.com> In-Reply-To: <20200206211936.17098-1-philmd@redhat.com> References: <20200206211936.17098-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: Xfr2Tm7nO5mWkjt3XXWheg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oksana Vohchana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Oksana Vohchana We are going to reuse this code when testing different transport methods, so factor it out first. Signed-off-by: Oksana Vohchana Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200203111631.18796-2-ovoshcha@redhat.com> [PMD: Split patch in 2, reworded subject and description] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/migration.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/migration.py b/tests/acceptance/migration.py index 3db733b1ce..03686d7de3 100644 --- a/tests/acceptance/migration.py +++ b/tests/acceptance/migration.py @@ -34,6 +34,16 @@ class Migration(Test): self.assertEqual(dst_vm.command('query-status')['status'], 'runnin= g') self.assertEqual(src_vm.command('query-status')['status'],'postmig= rate') =20 + def do_migrate(self, dest_uri, src_uri=3DNone): + source_vm =3D self.get_vm() + dest_vm =3D self.get_vm('-incoming', dest_uri) + dest_vm.launch() + if src_uri is None: + src_uri =3D dest_uri + source_vm.launch() + source_vm.qmp('migrate', uri=3Dsrc_uri) + self.assert_migration(source_vm, dest_vm) + def _get_free_port(self): port =3D network.find_free_port() if port is None: @@ -42,10 +52,5 @@ class Migration(Test): =20 =20 def test_migration_with_tcp_localhost(self): - source_vm =3D self.get_vm() dest_uri =3D 'tcp:localhost:%u' % self._get_free_port() - dest_vm =3D self.get_vm('-incoming', dest_uri) - dest_vm.launch() - source_vm.launch() - source_vm.qmp('migrate', uri=3Ddest_uri) - self.assert_migration(source_vm, dest_vm) + self.do_migrate(dest_uri) --=20 2.21.1