From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7268555392064421888 X-Received: by 2002:a05:6512:23a7:b0:4fe:feb:fef9 with SMTP id c39-20020a05651223a700b004fe0febfef9mr2199760lfv.24.1692342431421; Fri, 18 Aug 2023 00:07:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:464e:0:b0:4f0:9517:7df6 with SMTP id s14-20020ac2464e000000b004f095177df6ls286175lfo.0.-pod-prod-06-eu; Fri, 18 Aug 2023 00:07:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELSOCbjpdsNIkm1Ucpz6alBUCDflYw3L0uKfnzzNEhSsWxrhxpNlUI6aIVS1RVCoK8Gzr5 X-Received: by 2002:a19:4f09:0:b0:4fe:5654:9d00 with SMTP id d9-20020a194f09000000b004fe56549d00mr970408lfb.48.1692342429248; 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=sj/BEsGYKpGDKffcdHIDPtUx7sA6X20NsxQrDTvmajZwrxPjWs/XpxVqh0U61ivFa6 Lkc+SJ48d58X0NEw0Y2wfc38KKfq+qoLK4T5qkUcKTGieTqWbsFuf+h80bBN3faBBfgq 0VrCnML9VKjIqjN+1MrCzqpaYrWXYSB12et/s8gU4pmfaH2V+ysAh/mCyJ0lNZMugydE jS8xp9pCY401P8EZZncWFOZm+3oUHpKvIAXXpLCkAx5w8+FJchge9UD1iHZJIcI4tQEm f/jLaQNg7zaQxFqTNtIuKYyR4eUkCEY3l1dSXFoYpVxGVTOSX5M43sApVxgS1Q7ZGtBB tLog== 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=VUQs90MZyi46LxHAQQoJM/6EjzgADcvEz1f5zZrAMH4=; fh=swRs1+OhWjovx1IrvOlKBWsdq9manB5qdcuGoHoh5Ak=; b=dYwm8AdrYrwuvHh3xg7B9FuevpPbutYhQlFvBBiu8SGhNwyd9L0LtcDKUsurmCDoug 8esl39wPRp89o5AxpK6oiVK7zY2/xEMkW4FzQRTrpcI2Q6HthlWiUQaW1ElTXjCZYqOQ jbAdFg2JBGV00gQUvCiUE8NOQ7zc4UILU2qMM6c5RfAyWe/fS2C2AUiHDtByvW/Cpf4a BDYgUczh6zP8DRXRS+Vv78slgWBTttdct5d9zRP6cP/B1hvzTYOqh0nVOLyiwbI7ReS/ EkyFpMdKcVRcPKh8csVz/y3por9tS2UXcB8lemeoS2MzT4IrI4lRtDob8zShWr3EZ5xq QDNg== 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 s12-20020a05640217cc00b0052174fd486fsi147270edy.1.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 37I7769k024239 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 18 Aug 2023 09:07:08 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 4/8] cibuilder.py: Simplify remote_run command Date: Fri, 18 Aug 2023 09:07:02 +0200 Message-Id: <20230818070706.27913-5-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: 9jDvWguc31bX Since we now parse qemu boot log in a separate small function even in case of executing SSH-based test, we don't need to pass qemu-related `proc` object to the ssh ping routine `wait_connection`. Signed-off-by: Uladzimir Bely --- testsuite/cibuilder.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 8f28d05a..c0bfb75c 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -268,10 +268,7 @@ class CIBuilder(Test): return rc - def wait_connection(self, proc, cmd_prefix, timeout): - if proc is None: - return 0 - + def wait_connection(self, cmd_prefix, timeout): self.log.debug('Waiting for SSH server ready...') rc = None @@ -279,9 +276,6 @@ class CIBuilder(Test): # Use 3 good SSH ping attempts to consider SSH connection is stable while time.time() < timeout and goodcnt < 3: goodcnt += 1 - if proc.poll() is not None: - self.log.error('Machine is not running') - return rc rc = self.exec_cmd('/bin/true', cmd_prefix) time.sleep(1) @@ -305,11 +299,13 @@ class CIBuilder(Test): return priv_key - def remote_run(self, user, host, port, cmd, script, proc=None, timeout=0): + def remote_run(self, user, host, port, cmd, script, timeout=0): priv_key = self.prepare_priv_key() cmd_prefix = self.get_ssh_cmd_prefix(user, host, port, priv_key) - rc = self.wait_connection(proc, cmd_prefix, timeout) + rc = 0 + if timeout: + rc = self.wait_connection(cmd_prefix, timeout) if rc == 0: if cmd is not None: @@ -476,7 +472,7 @@ class CIBuilder(Test): if match: port = match.group(1) break - rc = self.remote_run(user, host, port, cmd, script, p1, timeout) + rc = self.remote_run(user, host, port, cmd, script, timeout) if rc != 0: self.vm_turn_off(p1) self.fail('Failed to run test over ssh') -- 2.20.1