From patchwork Fri Jan 13 08:04:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lingli Chen X-Patchwork-Id: 122006 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EDDA0423C1; Fri, 13 Jan 2023 10:05:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C7C1D410EF; Fri, 13 Jan 2023 10:05:01 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 7C3FA410D4 for ; Fri, 13 Jan 2023 10:04:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673600699; x=1705136699; h=from:to:cc:subject:date:message-id; bh=eiFK+elY5lOk+GLO/oWks6ie/io5ZKhIPVTQrjThnes=; b=TXfNkPdmNU+O7ZhKY6jxoTQ66wlOa4PINz6RZfc3aNXL9qUiah+usJ35 sSrdFL23o4KMqR1Q47kpJZ8wEZ79OCTL3qnenfDvMuNMpi7i8/hWZD4GY vpEVNZSgoxfuewiRWgGWqjLrtQbNe6p64z2O4Q29FqCACeTMoZqYckq8u KRzzfufKEBR40afM/PYNcN1fDWNmi2xFLoFqNLyOt4qDHeiirap+4F4dt cnjS1iAD0wuXu/i+MXwfVwiabDI3xsc2L3NpmeCh5ZBhQv16kXnm1opEd w02Biw5wPflC/DwiQTpSEtEf8FruECz04pIsO8Bs30PE55NqRvdNaHwTR Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="324011995" X-IronPort-AV: E=Sophos;i="5.97,213,1669104000"; d="scan'208";a="324011995" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2023 01:04:58 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="832014666" X-IronPort-AV: E=Sophos;i="5.97,213,1669104000"; d="scan'208";a="832014666" Received: from unknown (HELO localhost.localdomain) ([10.239.252.99]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2023 01:04:57 -0800 From: Lingli Chen To: dts@dpdk.org Cc: Lingli Chen Subject: [dts][PATCH V1] framework/crb: fix _is_container error Date: Fri, 13 Jan 2023 03:04:45 -0500 Message-Id: <20230113080445.67548-1-linglix.chen@intel.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org fix dts commit 311c7f04 (fix _is_container error on FreeBSD) Adjust the judgment order according to FreeBSD Signed-off-by: Lingli Chen --- framework/crb.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/crb.py b/framework/crb.py index f15df730..4ffee558 100644 --- a/framework/crb.py +++ b/framework/crb.py @@ -1054,12 +1054,12 @@ class Crb(object): return True elif self.send_expect("df -h / |grep overlay ", "# "): return True + elif self.get_os_type() == "freebsd": + return False elif self.send_expect( "systemd-detect-virt -c|egrep '(systemd-nspawn|lxc|docker|podman|rkt|wsl|container-other)$' ", "# ", ): return True - elif self.get_os_type() == "freebsd": - return False else: return False