From mboxrd@z Thu Jan  1 00:00:00 1970
X-GM-THRID: 7205110283261444096
X-Received: by 2002:a63:7f1a:0:b0:4d9:8f44:e1d7 with SMTP id a26-20020a637f1a000000b004d98f44e1d7mr468723pgd.4.1677570464657;
        Mon, 27 Feb 2023 23:47:44 -0800 (PST)
X-BeenThere: isar-users@googlegroups.com
Received: by 2002:a17:902:e84e:b0:19c:b122:6f2d with SMTP id
 t14-20020a170902e84e00b0019cb1226f2dls13575618plg.2.-pod-prod-gmail; Mon, 27
 Feb 2023 23:47:43 -0800 (PST)
X-Google-Smtp-Source: AK7set9XnWNEA3KI5g27APdhwp3Gm+/WcWO3FulZE5c68PSDtRgleL2Z1JLVs6a8xWshhwhRnJ4U
X-Received: by 2002:a17:90b:1e0b:b0:237:99b9:c415 with SMTP id pg11-20020a17090b1e0b00b0023799b9c415mr2188733pjb.38.1677570463584;
        Mon, 27 Feb 2023 23:47:43 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1677570463; cv=none;
        d=google.com; s=arc-20160816;
        b=b0swSybkHuJrLorp4YYm8Snvzk6Wup43pt+M79hI7IH6cxFdp9HfxleYMdjuIVp39S
         t3JW6LJ1uV2JWjTa96QR6+W78fn460cL4QpWQTNd8L42B5tJASL5kWoxcIzj8yoMNp/E
         Q457EqTtzPCRDcmAa8oo+h4eUw8X5q+GF0EvwUp7nnd6eIW6CHj5ZWe7+6/8gT0fCgr3
         HJSEdVBVd80EgzYt0IlavUPs3crZcYp5GkpWLZa5uQH3gXouBpyrV6xFUNhLpfzRRawO
         1DNpAmcqEpJqJxyns8D1G9OKQyTVhO2t/2Befqg8/h9BE8wflFT9XkHQUvFCp5p1+Cus
         bIRQ==
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=zC+IscIC0xtVOAJRQ3+B3Ae2eccAF+nOz+UP5+P67Y8=;
        b=zYLClSt+u4GwfWN2JvQ3//22f5KP0zR59FGrEcFivKS7ZzVwZxNXg3Ps/8hJhWA77/
         viIsJqHJJUWdXK7c0Z5szHQQVMlnFewyGnMDLIKxpnmcdclFVoqeH9o3QlyUkPHegPe9
         HsPEEQAtvkE1efRvBYWaWzFO4EpPXLeaCdrf8KDKSF+RZvShOEyTdQ6n+I3GLtHXazPf
         b9fUtlYooOAaHortdPHQhS7mgtfOAoncqRwWQdkvHQsO4rbn8DIYu6CJlosWqshxp4KD
         BA2zlx5TYpOo6lMA4Lvj4d2IvO/d3czRZrvqK5runtFODifw/SbAq77gLdCqe7gDyNgA
         03dg==
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: <ubely@ilbers.de>
Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166])
        by gmr-mx.google.com with ESMTPS id z19-20020a170902ee1300b0019adff17332si486782plb.0.2023.02.27.23.47.42
        for <isar-users@googlegroups.com>
        (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256);
        Mon, 27 Feb 2023 23:47:43 -0800 (PST)
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 31S7lcoN010874
	(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT)
	for <isar-users@googlegroups.com>; Tue, 28 Feb 2023 08:47:38 +0100
From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH 1/3] testsuite: Check availability of script to run over ssh
Date: Tue, 28 Feb 2023 08:47:36 +0100
Message-Id: <20230228074738.16304-2-ubely@ilbers.de>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20230228074738.16304-1-ubely@ilbers.de>
References: <20230228074738.16304-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: 5ZRVvNyDqMTz

Running local scripts on remote machine over ssh is implemented as
`cat <script> | ssh ...". This always returns PASSED in case script
not found at specified location since the error code `cat` produces
in this case is masked by `ssh` command that finishes OK.

This fix is intended for downstreams that set custom script location
by passing `-p test_script_dir=<path>` to avocado arguments.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 testsuite/cibuilder.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
index 0f84ccaf..d3d90a22 100755
--- a/testsuite/cibuilder.py
+++ b/testsuite/cibuilder.py
@@ -244,6 +244,10 @@ class CIBuilder(Test):
         script_dir = self.params.get('test_script_dir',
                                      default=os.path.abspath(os.path.dirname(__file__))) + '/'
         script_path = script_dir + script
+        if not os.path.exists(script_path):
+            self.log.error('Script not found: ' + script_path)
+            return 2
+
         rc = subprocess.call('cat ' + script_path + ' | ' + str(cmd_prefix), shell=True,
                              stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         return rc
-- 
2.20.1