From patchwork Mon Sep 7 15:17:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 1359008 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BlX2b11j8z9sSP; Tue, 8 Sep 2020 01:17:25 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kFItR-0001oR-Aw; Mon, 07 Sep 2020 15:17:17 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kFItP-0001o3-AD for kernel-team@lists.ubuntu.com; Mon, 07 Sep 2020 15:17:15 +0000 Received: from 1.general.ppisati.uk.vpn ([10.172.193.134] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kFItP-0005DF-0j for kernel-team@lists.ubuntu.com; Mon, 07 Sep 2020 15:17:15 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH][autotest-client-tests] UBUNTU: SAUCE: ubuntu_qrt_apparmor: on Groovy+, invoke the test using python3 Date: Mon, 7 Sep 2020 17:17:14 +0200 Message-Id: <20200907151714.66629-1-paolo.pisati@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1890771 Fix the: The test will fail with: ImportError: No module named pexpect error when invoked on Groovy+. Signed-off-by: Paolo Pisati --- ubuntu_qrt_apparmor/ubuntu_qrt_apparmor.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ubuntu_qrt_apparmor/ubuntu_qrt_apparmor.py b/ubuntu_qrt_apparmor/ubuntu_qrt_apparmor.py index 27b5d1a1..c7a24dcc 100644 --- a/ubuntu_qrt_apparmor/ubuntu_qrt_apparmor.py +++ b/ubuntu_qrt_apparmor/ubuntu_qrt_apparmor.py @@ -78,7 +78,12 @@ class ubuntu_qrt_apparmor(test.test): if test_name == 'setup': return - cmd = 'python2 ./%s -v' % test_name + inter = 'python3' + series = platform.dist()[2] + if series in ['precise', 'trusty', 'xenial', 'bionic', 'focal']: + inter = 'python2' + + cmd = '%s ./%s -v' % (inter, test_name) self.results = utils.system_output(cmd, retain_output=True)