test suite reviews and discussions
 help / color / mirror / Atom feed
* [dts][PATCH V1] framework/crb: fix _is_container error
@ 2023-01-10  2:31 Lingli Chen
  0 siblings, 0 replies; 3+ messages in thread
From: Lingli Chen @ 2023-01-10  2:31 UTC (permalink / raw)
  To: dts; +Cc: Lingli Chen

Fix issue adapts to FreeBSD system.
fix dts commit 0ef9bfbf (framework: add docker container support)

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 framework/crb.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/framework/crb.py b/framework/crb.py
index 48526ac1..dd915f21 100644
--- a/framework/crb.py
+++ b/framework/crb.py
@@ -1054,10 +1054,5 @@ class Crb(object):
             return True
         elif self.send_expect("df -h / |grep overlay ", "# "):
             return True
-        elif self.send_expect(
-            "systemd-detect-virt -c|egrep '(systemd-nspawn|lxc|docker|podman|rkt|wsl|container-other)$' ",
-            "# ",
-        ):
-            return True
         else:
             return False
-- 
2.17.1


^ permalink raw reply	[flat|nested] 3+ messages in thread
* [dts][PATCH V1] framework/crb: fix _is_container error
@ 2023-01-13  8:04 Lingli Chen
  2023-01-29  1:44 ` lijuan.tu
  0 siblings, 1 reply; 3+ messages in thread
From: Lingli Chen @ 2023-01-13  8:04 UTC (permalink / raw)
  To: dts; +Cc: Lingli Chen

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(-)

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
-- 
2.17.1


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-29  1:44 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-10  2:31 [dts][PATCH V1] framework/crb: fix _is_container error Lingli Chen
2023-01-13  8:04 Lingli Chen
2023-01-29  1:44 ` lijuan.tu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).