[V1] framework/crb: fix _is_container error
Checks
Context |
Check |
Description |
ci/Intel-dts-format-test |
success
|
Testing OK
|
ci/Intel-dts-pylama-test |
success
|
Testing OK
|
ci/Intel-dts-suite-test |
success
|
Testing OK
|
Commit Message
fix dts commit 311c7f04 (fix _is_container error on FreeBSD)
Adjust the judgment order according to FreeBSD
Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
framework/crb.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Comments
On Fri, 13 Jan 2023 03:04:45 -0500, Lingli Chen <linglix.chen@intel.com> wrote:
> fix dts commit 311c7f04 (fix _is_container error on FreeBSD)
> Adjust the judgment order according to FreeBSD
>
> Signed-off-by: Lingli Chen <linglix.chen@intel.com>
Applied, thanks
@@ -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