Merge ~sylvain-pineau/plainbox-provider-checkbox:fix-1967032 into plainbox-provider-checkbox:master

[Sylvain Pineau]

Fixes the linked bug.

pm_test (and x-terminal-emulator) does not work in wayland sessions.

This patch catches the subprocess exception and executes the respawn commands
using plain subprocess run() commands.

Tested using the dev ppa base install, this patch and the latest 22.04 daily (03-29)

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

[Devices Certification Bot (ce-certification-qa)]

The merge was fine but running tests failed.

"10.38.105.54"
"10.38.105.108"
"10.38.105.197"
[xenial] [16:18:10] starting container
Device project added to xenial-testing
"10.38.105.54"
[xenial] [16:18:36] provisioning container
[focal] [16:18:37] starting container
[bionic] [16:18:50] starting container
Device project added to focal-testing
"10.38.105.181"
[focal] [16:19:07] provisioning container
Device project added to bionic-testing
"10.38.105.52"
[bionic] [16:19:20] provisioning container
[xenial] [16:19:53] Starting tests...
[xenial] Found a test script: ./requirements/container-tests-provider-checkbox
[bionic] [16:20:25] Starting tests...
[bionic] Found a test script: ./requirements/container-tests-provider-checkbox
[focal] [16:21:10] Starting tests...
[focal] Found a test script: ./requirements/container-tests-provider-checkbox
[xenial] [16:21:12] container-tests-provider-checkbox: FAIL
[xenial] output: https://paste.ubuntu.com/p/hGVhbSbGWT/
[xenial] [16:21:15] Fixing file permissions in source directory
[xenial] [16:21:15] Destroying container
[bionic] [16:21:56] container-tests-provider-checkbox: FAIL
[bionic] output: https://paste.ubuntu.com/p/QdNwzGJcQx/
[bionic] [16:21:58] Fixing file permissions in source directory
[bionic] [16:21:58] Destroying container
[focal] [16:23:04] container-tests-provider-checkbox: FAIL
[focal] output: https://paste.ubuntu.com/p/xBfkJ7rjg4/
[focal] [16:23:06] Fixing file permissions in source directory
[focal] [16:23:06] Destroying container

review: Needs Fixing

diff --git a/bin/pm_test.py b/bin/pm_test.py
index 45f52ec..92a5863 100755
--- a/bin/pm_test.py
+++ b/bin/pm_test.py
@@ -286,12 +286,21 @@ class PowerManagementOperation():
             title = '{0} test'.format(self.args.pm_operation.capitalize())
             MessageDialog(title, message).run()
         if self.args.checkbox_respawn_cmd:
-            subprocess.run(
-                r'unset LD_LIBRARY_PATH;'
-                r'unset PYTHONPATH; unset PYTHONHOME;'
-                r'DISPLAY=:0 x-terminal-emulator -e "sudo -u '
-                r'{} bash -c \"source {}; exec bash\""'.format(
-                    self.user, self.args.checkbox_respawn_cmd), shell=True)
+            try:
+                subprocess.run(
+                    r'unset LD_LIBRARY_PATH;'
+                    r'unset PYTHONPATH; unset PYTHONHOME;'
+                    r'DISPLAY=:0 x-terminal-emulator -e "sudo -u '
+                    r'{} bash -c \"source {}; exec bash\""'.format(
+                        self.user, self.args.checkbox_respawn_cmd),
+                    shell=True,
+                    check=True)
+            # x-terminal-emulator command does not work on Wayland
+            # Run the checkbox_respawn_cmd via subprocess.run instead
+            except subprocess.CalledProcessError:
+                with open(self.args.checkbox_respawn_cmd, 'rt') as f:
+                    for l in f:
+                        subprocess.run(l, shell=True)
 
     def teardown(self):
         """