From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7268555392064421888 X-Received: by 2002:a05:600c:4f45:b0:3fb:e1d0:6417 with SMTP id m5-20020a05600c4f4500b003fbe1d06417mr4000056wmq.19.1692342431801; Fri, 18 Aug 2023 00:07:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fcd2:0:b0:317:79ec:7a0 with SMTP id f18-20020adffcd2000000b0031779ec07a0ls268278wrs.1.-pod-prod-04-eu; Fri, 18 Aug 2023 00:07:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFqyZ44w9xkl06piy92v/GHt9qUXMPiEushE2IhLDs4kpo9q33XOJTZSqV4CVxxlZbpq1YR X-Received: by 2002:adf:feca:0:b0:319:6e58:7096 with SMTP id q10-20020adffeca000000b003196e587096mr1137612wrs.66.1692342429804; Fri, 18 Aug 2023 00:07:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692342429; cv=none; d=google.com; s=arc-20160816; b=jepDnrDB/Re1wse08QaMOSQdQrPjsxY54KmtxB91lTwOwQOXgVrzC2atJXl6+Dbme8 15CPQiluJsqinweHG9q3I0nkCIDrpUh/k/GK4ld9NASy/FVtWN9PFO/sSvRZoq83JAEe qDO9cBacvCbJRDebvBJErqHhcYV1XHh38CM29SzXBn4rtuCIJwCLjAQnthnzvnUEmgha I4kGOiPOPx3heiFr+GTYwkCykh7MLIg340tp02152QkFSzW0om1V6AOvNdhjoUeILqNu +LpKhSE2EZeJb8DVKW9PHx8BH2lyLxYu1Pyhbt18awA0eIflbcTMqcluNawTyHIPaZL2 3Tbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=foWtiX92/gqA3FWTFUHAnKnZ4sn1QLC8GCQrDQwEKR0=; fh=swRs1+OhWjovx1IrvOlKBWsdq9manB5qdcuGoHoh5Ak=; b=00C9KYL/myxNgIHmwwe/xYkSiX61VwH2pU7WKa8q7lOAmJUsvIQVY1l5NC7Xci6PGf mYMzGeWKx1NH85ZXaN4DcdXXw3cMe6Qc5805mFFK1N/uNOVVp+/hi5nkG9OTUvg0fp0h 1GBu6WJf41Pbu/14E9ZLKgRhBuzoSUdKq236v43TbgWiFogC7ZSJNHQbz7WZ/pCpZJ3T U0KOQbEhChoeHaZYiPB7taVJe9b6BrJ2DIGqTFiabV0NvicmUORB/yJedBJv3Bt5d5mY lckzMaYgOpCHAq+1OkBJfHphnGN/BR366ocxYYsYE2hO+aOI67BhmBegK2P2zOz4r/DT UJGQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id m11-20020adfa3cb000000b00317e1e2b28asi153671wrb.4.2023.08.18.00.07.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Aug 2023 00:07:09 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 37I7769m024239 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 18 Aug 2023 09:07:09 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 6/8] citest.py: Adapt tests to qemu reuse Date: Fri, 18 Aug 2023 09:07:04 +0200 Message-Id: <20230818070706.27913-7-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230818070706.27913-1-ubely@ilbers.de> References: <20230818070706.27913-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: SltIHLnWqLuR Reusing the same qemu machine in several tests requires stopping the VM by the last one. Adapt testsuite top level to fit this requirement. Signed-off-by: Uladzimir Bely --- testsuite/citest.py | 136 +++++++++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 57 deletions(-) diff --git a/testsuite/citest.py b/testsuite/citest.py index 461b26c1..0cfb46ff 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -61,16 +61,18 @@ class DevTest(CIBaseTest): def test_dev_run_amd64_bullseye(self): self.init() - self.vm_start('amd64', 'bullseye', \ - image='isar-image-ci') + self.vm_start('amd64', 'bullseye', image='isar-image-ci', + stop_vm=True) def test_dev_run_arm64_bullseye(self): self.init() - self.vm_start('arm64', 'bullseye') + self.vm_start('arm64', 'bullseye', + stop_vm=True) def test_dev_run_arm_bullseye(self): self.init() - self.vm_start('arm', 'bullseye', skip_modulecheck=True) + self.vm_start('arm', 'bullseye', skip_modulecheck=True, + stop_vm=True) class ReproTest(CIBaseTest): @@ -300,7 +302,9 @@ class SingleTest(CIBaseTest): machine = self.params.get('machine', default='qemuamd64') distro = self.params.get('distro', default='bullseye') - self.vm_start(machine.removeprefix('qemu'), distro) + self.vm_start(machine.removeprefix('qemu'), distro, + stop_vm=True) + class VmBootTestFast(CIBaseTest): @@ -309,50 +313,54 @@ class VmBootTestFast(CIBaseTest): :avocado: tags=startvm,fast """ + def test_arm_bullseye(self): self.init() - self.vm_start('arm','bullseye', \ - image='isar-image-ci') + self.vm_start('arm','bullseye', image='isar-image-ci') def test_arm_bullseye_example_module(self): self.init() - self.vm_start('arm','bullseye', \ - image='isar-image-ci', cmd='lsmod | grep example_module') + self.vm_start('arm','bullseye', image='isar-image-ci', + cmd='lsmod | grep example_module') def test_arm_bullseye_getty_target(self): self.init() - self.vm_start('arm','bullseye', \ - image='isar-image-ci', script='test_getty_target.sh') + self.vm_start('arm','bullseye', image='isar-image-ci', + script='test_getty_target.sh', + stop_vm=True) + def test_arm_buster(self): self.init() - self.vm_start('arm','buster', \ - image='isar-image-ci') + self.vm_start('arm','buster', image='isar-image-ci') def test_arm_buster_getty_target(self): self.init() - self.vm_start('arm','buster', \ - image='isar-image-ci', cmd='systemctl is-active getty.target') + self.vm_start('arm','buster', image='isar-image-ci', + cmd='systemctl is-active getty.target') def test_arm_buster_example_module(self): self.init() - self.vm_start('arm','buster', \ - image='isar-image-ci', script='test_example_module.sh') + self.vm_start('arm','buster', image='isar-image-ci', + script='test_example_module.sh', + stop_vm=True) + def test_arm_bookworm(self): self.init() - self.vm_start('arm','bookworm', \ - image='isar-image-ci') + self.vm_start('arm','bookworm', image='isar-image-ci') def test_arm_bookworm_example_module(self): self.init() - self.vm_start('arm','bookworm', \ - image='isar-image-ci', cmd='lsmod | grep example_module') + self.vm_start('arm','bookworm', image='isar-image-ci', + cmd='lsmod | grep example_module') def test_arm_bookworm_getty_target(self): self.init() - self.vm_start('arm','bookworm', \ - image='isar-image-ci', script='test_getty_target.sh') + self.vm_start('arm','bookworm', image='isar-image-ci', + script='test_getty_target.sh', + stop_vm=True) + class VmBootTestFull(CIBaseTest): @@ -361,92 +369,106 @@ class VmBootTestFull(CIBaseTest): :avocado: tags=startvm,full """ + def test_arm_bullseye(self): self.init() - self.vm_start('arm','bullseye') + self.vm_start('arm','bullseye', + stop_vm=True) + def test_arm_buster(self): self.init() - self.vm_start('arm','buster', \ - image='isar-image-ci') + self.vm_start('arm','buster', image='isar-image-ci') def test_arm_buster_example_module(self): self.init() - self.vm_start('arm','buster', \ - image='isar-image-ci', cmd='lsmod | grep example_module') + self.vm_start('arm','buster', image='isar-image-ci', + cmd='lsmod | grep example_module') def test_arm_buster_getty_target(self): self.init() - self.vm_start('arm','buster', \ - image='isar-image-ci', script='test_getty_target.sh') + self.vm_start('arm','buster', image='isar-image-ci', + script='test_getty_target.sh', + stop_vm=True) + def test_arm64_bullseye(self): self.init() - self.vm_start('arm64','bullseye', \ - image='isar-image-ci') + self.vm_start('arm64','bullseye', image='isar-image-ci') def test_arm64_bullseye_getty_target(self): self.init() - self.vm_start('arm64','bullseye', \ - image='isar-image-ci', cmd='systemctl is-active getty.target') + self.vm_start('arm64','bullseye', image='isar-image-ci', + cmd='systemctl is-active getty.target') def test_arm64_bullseye_example_module(self): self.init() - self.vm_start('arm64','bullseye', \ - image='isar-image-ci', script='test_example_module.sh') + self.vm_start('arm64','bullseye', image='isar-image-ci', + script='test_example_module.sh', + stop_vm=True) + def test_i386_buster(self): self.init() - self.vm_start('i386','buster') + self.vm_start('i386','buster', + stop_vm=True) + def test_amd64_buster(self): self.init() # test efi boot - self.vm_start('amd64','buster', \ - image='isar-image-ci') + self.vm_start('amd64','buster', image='isar-image-ci', + stop_vm=True) # test pcbios boot - self.vm_start('amd64', 'buster', True, \ - image='isar-image-ci') + self.vm_start('amd64', 'buster', True, image='isar-image-ci', + stop_vm=True) + def test_amd64_focal(self): self.init() - self.vm_start('amd64','focal', \ - image='isar-image-ci') + self.vm_start('amd64','focal', image='isar-image-ci') def test_amd64_focal_example_module(self): self.init() - self.vm_start('amd64','focal', \ - image='isar-image-ci', cmd='lsmod | grep example_module') + self.vm_start('amd64','focal', image='isar-image-ci', + cmd='lsmod | grep example_module') def test_amd64_focal_getty_target(self): self.init() - self.vm_start('amd64','focal', \ - image='isar-image-ci', script='test_getty_target.sh') + self.vm_start('amd64','focal', image='isar-image-ci', + script='test_getty_target.sh', + stop_vm=True) + def test_amd64_bookworm(self): self.init() - self.vm_start('amd64', 'bookworm', image='isar-image-ci') + self.vm_start('amd64', 'bookworm', image='isar-image-ci', + stop_vm=True) + def test_arm_bookworm(self): self.init() - self.vm_start('arm','bookworm', \ - image='isar-image-ci') + self.vm_start('arm','bookworm', image='isar-image-ci', + stop_vm=True) + def test_i386_bookworm(self): self.init() - self.vm_start('i386','bookworm') + self.vm_start('i386','bookworm', + stop_vm=True) + def test_mipsel_bookworm(self): self.init() - self.vm_start('mipsel','bookworm', \ - image='isar-image-ci') + self.vm_start('mipsel','bookworm', image='isar-image-ci') def test_mipsel_bookworm_getty_target(self): self.init() - self.vm_start('mipsel','bookworm', \ - image='isar-image-ci', cmd='systemctl is-active getty.target') + self.vm_start('mipsel','bookworm', image='isar-image-ci', + cmd='systemctl is-active getty.target') def test_mipsel_bookworm_example_module(self): self.init() - self.vm_start('mipsel','bookworm', \ - image='isar-image-ci', script='test_example_module.sh') + self.vm_start('mipsel','bookworm', image='isar-image-ci', + script='test_example_module.sh', + stop_vm=True) -- 2.20.1