From mboxrd@z Thu Jan  1 00:00:00 1970
X-GM-THRID: 7214004495725887488
X-Received: by 2002:a54:438b:0:b0:37f:a2ad:6718 with SMTP id u11-20020a54438b000000b0037fa2ad6718mr3509334oiv.3.1679641310456;
        Fri, 24 Mar 2023 00:01:50 -0700 (PDT)
X-BeenThere: isar-users@googlegroups.com
Received: by 2002:a05:6870:c0c2:b0:176:30d5:30b9 with SMTP id
 e2-20020a056870c0c200b0017630d530b9ls324795oad.9.-pod-prod-gmail; Fri, 24 Mar
 2023 00:01:49 -0700 (PDT)
X-Google-Smtp-Source: AK7set/RE18sAB+tqPoZ4HvEpHAcLNSbcrDbqG/eJUgGQmwBf57S6dRKy7dvjilmQn7uCkcfpy2A
X-Received: by 2002:a05:6870:17a9:b0:177:c2ec:1a77 with SMTP id r41-20020a05687017a900b00177c2ec1a77mr1341652oae.30.1679641309758;
        Fri, 24 Mar 2023 00:01:49 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1679641309; cv=none;
        d=google.com; s=arc-20160816;
        b=lBihKtHbv/u160vaxhC9CYJ/fZHP7y4qApRGab6nLZtfJOy1g403e/4N7qw2xVQJw7
         KJ+WJekHg7g6TvpX3FJZKmOTC99Aerk0danAFtK0rPcUxw9PKF5pXHh3DtV5UXrOoKiH
         1MefFV8KZEXYG97i7OO1oyXmMnWPH7U/YnbjAph57vnszPqeiR3qkJxzHeSUpuhtObEy
         dEtW0FCbob95rcZdh/65tjfQfoa5rn0IxIqJGZ7hFdoyg84ezcS7OudBUHQn50/SZ55c
         lGYdPRbBdp1vCf2c5zYJkTyGblaNFxNpqfHzwYQidCWAIMYWnGWorzcaONOdB+x6k5vZ
         VZXg==
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=L25CNQ4aeOXb6dSqXHcsVxNXOzQVartCZ0qZgB7QHjI=;
        b=Qg1rQh9MMQhdWgqvzDxW9gsauE0zfPCXej2HKOA1T/8adGUhXfpz7S3xDSN1TNdXiY
         AszCuDQoLFO75IAlJwSYfGq3Se6+IP0wXiVUnSh5rGijnmr3fDdWqJ3l3Qxj33djtQgf
         qdSIQWW7T+vATT9WLVgrxF8hrbY2oT67gAyol6N94GKKRoz1RluY0mc9+xdGL6w1jrvJ
         JGCMD66MU1VQm53LJKX//5KpthsZzYsl4CDDJz5CGPf52XEz6e16f+MMyO9Wc7m00PJj
         O92gw18iYwC/xduretdoiOfQpCYXSnJezMa+LwSEQXibTvHQ/0RzlXLFdPHKpW03jzSF
         14tQ==
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 bq21-20020a056830389500b0069f661ebb59si1655963otb.5.2023.03.24.00.01.48
        for <isar-users@googlegroups.com>
        (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256);
        Fri, 24 Mar 2023 00:01:49 -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 32O71gCp007069
	(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT)
	for <isar-users@googlegroups.com>; Fri, 24 Mar 2023 08:01:43 +0100
From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v2 1/3] testsuite: Check availability of script to run over ssh
Date: Fri, 24 Mar 2023 08:01:40 +0100
Message-Id: <20230324070142.27122-2-ubely@ilbers.de>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20230324070142.27122-1-ubely@ilbers.de>
References: <20230324070142.27122-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: XrTdzfL0fRnU

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 9e84c3a3..484a90b3 100755
--- a/testsuite/cibuilder.py
+++ b/testsuite/cibuilder.py
@@ -248,6 +248,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