Skip to contentSkip to conversation

enhanced weston automated tests

PATCH New Yeoh Ee Peng 1 participant 2 messages Apr 21, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 enhanced weston automated tests

v02:
- add retry checking for wayland processes up to 5 times, as it took different amount of time to initialize wayland compositor inside qemu created by host machine

v03:
- previous patch missed the DISTRO_FEATURES_remove = "x11" configuration in the building of core-image-weston, where the test was using x11 DISPLAY for initializing new wayland compositor
- replace the environment setup 'export DISPLAY=:0' which use x11 with 'export WAYLAND_DISPLAY=wayland-0' since the target core-image-weston had removed x11
- include logging for wayland compositor initialization to track detail for debugging in case test fail

Yeoh Ee Peng (1):
oeqa/runtime/weston: Enhance weston tests

 meta/lib/oeqa/runtime/cases/weston.py | 50 +++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
Signature · 1 line
2.7.4
#1 lore raw

PATCH v3 1/1 oeqa/runtime/weston: Enhance weston tests

Existing weston test available make sure that a process for weston-desktop-shell exist when image boot up.

Enhance weston tests by:
- execute weston-info to make sure weston interface(s) are initialized
- execute weston and make sure it can initialize a new wayland compositor (retry checking for wayland processes up to 5 times)
- enable weston logging for debugging when fail to initialize wayland compositor

[YOCTO# 10690]

---
 meta/lib/oeqa/runtime/cases/weston.py | 50 +++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
meta/lib/oeqa/runtime/cases/weston.py +50 -0
index f32599a..ac29eca 100644
@@ -6,8 +6,15 @@ from oeqa.runtime.case import OERuntimeTestCase
 from oeqa.core.decorator.depends import OETestDepends
 from oeqa.core.decorator.data import skipIfNotFeature
 from oeqa.runtime.decorator.package import OEHasPackage
+import threading
+import time
 
 class WestonTest(OERuntimeTestCase):
+    weston_log_file = '/tmp/weston.log'
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.tc.target.run('rm %s' % cls.weston_log_file)
 
     @OETestDepends(['ssh.SSHTest.test_ssh'])
     @OEHasPackage(['weston'])
@@ -17,3 +24,46 @@ class WestonTest(OERuntimeTestCase):
         msg = ('Weston does not appear to be running %s' %
               self.target.run(self.tc.target_cmds['ps'])[1])
         self.assertEqual(status, 0, msg=msg)
+
+    def get_processes_of(self, target, error_msg):
+        status, output = self.target.run('pidof %s' % target)
+        self.assertEqual(status, 0, msg='Retrieve %s (%s) processes error: %s' % (target, error_msg, output))
+        return output.split(" ")
+
+    def get_weston_command(self, cmd):
+        return 'export XDG_RUNTIME_DIR=/run/user/0; export WAYLAND_DISPLAY=wayland-0; %s' % cmd
+
+    def run_weston_init(self):
+        self.target.run(self.get_weston_command('weston --log=%s' % self.weston_log_file))
+
+    def get_new_wayland_processes(self, existing_wl_processes):
+        try_cnt = 0
+        while try_cnt < 5:
+            time.sleep(5 + 5*try_cnt)
+            try_cnt += 1
+            wl_processes = self.get_processes_of('weston-desktop-shell', 'existing and new')
+            new_wl_processes = [x for x in wl_processes if x not in existing_wl_processes]
+            if new_wl_processes:
+                return new_wl_processes, try_cnt
+
+        return new_wl_processes, try_cnt
+
+    @OEHasPackage(['weston'])
+    def test_weston_info(self):
+        status, output = self.target.run(self.get_weston_command('weston-info'))
+        self.assertEqual(status, 0, msg='weston-info error: %s' % output)
+
+    @OEHasPackage(['weston'])
+    def test_weston_can_initialize_new_wayland_compositor(self):
+        existing_wl_processes = self.get_processes_of('weston-desktop-shell', 'existing')
+        existing_weston_processes = self.get_processes_of('weston', 'existing')
+
+        weston_thread = threading.Thread(target=self.run_weston_init)
+        weston_thread.start()
+        new_wl_processes, try_cnt = self.get_new_wayland_processes(existing_wl_processes)
+        existing_and_new_weston_processes = self.get_processes_of('weston', 'existing and new')
+        new_weston_processes = [x for x in existing_and_new_weston_processes if x not in existing_weston_processes]
+        for w in new_weston_processes:
+            self.target.run('kill -9 %s' % w)
+        __, weston_log = self.target.run('cat %s' % self.weston_log_file)
+        self.assertTrue(new_wl_processes, msg='Could not get new weston-desktop-shell processes (%s, try_cnt:%s) weston log: %s' % (new_wl_processes, try_cnt, weston_log))
Signature · 1 line
2.7.4