Skip to contentSkip to conversation

oeqa/runtime/weston: Enhance weston tests

PATCH Superseded Yeoh Ee Peng 3 participants 6 messages Apr 13, 2020 – Apr 21, 2020

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 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

[YOCTO# 10690]

---
 meta/lib/oeqa/runtime/cases/weston.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
meta/lib/oeqa/runtime/cases/weston.py +30 -0
index f32599a..f79ed64 100644
@@ -6,6 +6,8 @@ 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):
 
@@ -17,3 +19,31 @@ 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_weston_command(self, cmd):
+        return 'export XDG_RUNTIME_DIR=/run/user/0; export DISPLAY=:0; %s' % cmd
+
+    def run_weston_init(self):
+        self.target.run(self.get_weston_command('weston'))
+
+    @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):
+        status, output = self.target.run('pidof weston-desktop-shell')
+        self.assertEqual(status, 0, msg='Retrieve existing weston-desktop-shell processes error: %s' % output)
+        existing_wl_processes = output.split(" ")
+
+        weston_thread = threading.Thread(target=self.run_weston_init)
+        weston_thread.start()
+        time.sleep(5)
+        status, output = self.target.run('pidof weston-desktop-shell')
+        self.assertEqual(status, 0, msg='Retrieve existing and new weston-desktop-shell processes error: %s' % output)
+        wl_processes = output.split(" ")
+        new_wl_processes = [x for x in wl_processes if x not in existing_wl_processes]
+        self.assertTrue(new_wl_processes, msg='Check new weston-desktop-shell processes error: %s' % new_wl_processes)
+        for wl in new_wl_processes:
+            self.target.run('kill -9 %s' % wl)
Signature · 1 line
2.7.4
#1 lore raw

Thanks, now one step closer to deprecating x11 :)

I'm thinking of rebasing all images used by autobuilder (e.g. -ptest, -sdk) to be based off core-image-weston in 3.2 timeframe. The only sato image would be core-image-sato itself.

Alex

Quoted 73 lines · Yeoh Ee Peng

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

[YOCTO# 10690]

---
 meta/lib/oeqa/runtime/cases/weston.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
meta/lib/oeqa/runtime/cases/weston.py +5 -0
index f32599a..f79ed64 100644
@@ -6,6 +6,8 @@ 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):
 
@@ -17,3 +19,31 @@ 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_weston_command(self, cmd):
+        return 'export XDG_RUNTIME_DIR=/run/user/0; export DISPLAY=:0;

%s' % cmd

meta/lib/oeqa/runtime/cases/weston.py +7 -0
+
+    def run_weston_init(self):
+        self.target.run(self.get_weston_command('weston'))
+
+    @OEHasPackage(['weston'])
+    def test_weston_info(self):
+        status, output =

self.target.run(self.get_weston_command('weston-info'))

meta/lib/oeqa/runtime/cases/weston.py +6 -0
+        self.assertEqual(status, 0, msg='weston-info error: %s' % output)
+
+    @OEHasPackage(['weston'])
+    def test_weston_can_initialize_new_wayland_compositor(self):
+        status, output = self.target.run('pidof weston-desktop-shell')
+        self.assertEqual(status, 0, msg='Retrieve existing

weston-desktop-shell processes error: %s' % output)

meta/lib/oeqa/runtime/cases/weston.py +7 -0
+        existing_wl_processes = output.split(" ")
+
+        weston_thread = threading.Thread(target=self.run_weston_init)
+        weston_thread.start()
+        time.sleep(5)
+        status, output = self.target.run('pidof weston-desktop-shell')
+        self.assertEqual(status, 0, msg='Retrieve existing and new

weston-desktop-shell processes error: %s' % output)

meta/lib/oeqa/runtime/cases/weston.py +2 -0
+        wl_processes = output.split(" ")
+        new_wl_processes = [x for x in wl_processes if x not in

existing_wl_processes]
+ self.assertTrue(new_wl_processes, msg='Check new
weston-desktop-shell processes error: %s' % new_wl_processes)

meta/lib/oeqa/runtime/cases/weston.py +2 -1
+        for wl in new_wl_processes:
+            self.target.run('kill -9 %s' % wl)
--

2.7.4

#2 lore raw
In reply to Yeoh Ee Peng
Quoted 9 lines · Yeoh Ee Peng

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

Quoted 3 lines

[YOCTO# 10690]

I think this fails under testing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/1785

Cheers,

Richard

#3 lore raw

Hi Richard,

After more testing, I realized that it will take different amount of time for each host machine to initialize new wayland compositor. I had added the logic to retry the checking of new wayland compositor to comprehend this host machine differences. I had submitted the v02 patch.

Thank you very much!

Thanks,
Yeoh Ee Peng

-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: Friday, April 17, 2020 6:35 AM
To: Yeoh, Ee Peng <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH] oeqa/runtime/weston: Enhance weston tests

Quoted 9 lines · Yeoh Ee Peng

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

Quoted 3 lines

[YOCTO# 10690]

I think this fails under testing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/1785

Cheers,

Richard

#4 lore raw

Hi Ee Peng,

Quoted 9 lines · Ee Peng

Hi Richard,

After more testing, I realized that it will take different amount of time for each host machine to initialize new wayland compositor. I had added the logic to retry the checking of new wayland compositor to comprehend this host machine differences. I had submitted the v02 patch.

Thank you very much!

I did try the v2 patch but it still failed unfortunately:

https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/1788

Cheers,

Richard

#5 lore raw

Hi Richard,

I found that I had missed the DISTRO_FEATURES_remove = "x11" configuration during previous development and testing, I had successfully reproduce the issue after incorporate the DISTRO_FEATURES_remove = "x11". I had tested the v03 patch and submitted the patch. Sorry for my mistake.

https://lists.openembedded.org/g/openembedded-core/message/137332
https://lists.openembedded.org/g/openembedded-core/message/137333

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

Thanks,
Ee Peng

-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: Friday, April 17, 2020 10:24 PM
To: Yeoh, Ee Peng <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH] oeqa/runtime/weston: Enhance weston tests

Hi Ee Peng,

Quoted 9 lines · Ee Peng

Hi Richard,

After more testing, I realized that it will take different amount of time for each host machine to initialize new wayland compositor. I had added the logic to retry the checking of new wayland compositor to comprehend this host machine differences. I had submitted the v02 patch.

Thank you very much!

I did try the v2 patch but it still failed unfortunately:

https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/1788

Cheers,

Richard