Merge ~sylvain-pineau/plainbox-provider-resource:display-resource-wayland-support into plainbox-provider-resource:master

[Sylvain Pineau]

This patch calls gnome-randr on wayland sessions to generate the -connected- display resources.

Note: Since a packaging meta data unit can only be declared once, it will be proposed via p-p-c

[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] [08:20:36] starting container
Device project added to xenial-testing
"10.38.105.54"
[xenial] [08:21:04] provisioning container
[bionic] [08:22:54] starting container
Device project added to bionic-testing
[xenial] [08:23:11] Starting tests...
[xenial] Found a test script: ./requirements/container-tests-provider-resource-generic
"10.38.105.156"
[bionic] [08:23:24] provisioning container
[focal] [08:23:25] starting container
[xenial] [08:23:39] container-tests-provider-resource-generic: FAIL
Device project added to focal-testing
[xenial] output: https://paste.ubuntu.com/p/BSDk8TMJNK/
[xenial] [08:23:41] Fixing file permissions in source directory
[xenial] [08:23:42] Destroying container
"10.38.105.167"
[focal] [08:23:53] provisioning container
[bionic] [08:24:53] Starting tests...
[bionic] Found a test script: ./requirements/container-tests-provider-resource-generic
[bionic] [08:25:22] container-tests-provider-resource-generic: FAIL
[bionic] output: https://paste.ubuntu.com/p/G8BBmgmksT/
[bionic] [08:25:24] Fixing file permissions in source directory
[bionic] [08:25:24] Destroying container
[focal] [08:26:11] Starting tests...
[focal] Found a test script: ./requirements/container-tests-provider-resource-generic
[focal] [08:26:37] container-tests-provider-resource-generic: FAIL
[focal] output: https://paste.ubuntu.com/p/pPXT3gMT3p/
[focal] [08:26:39] Fixing file permissions in source directory
[focal] [08:26:39] Destroying container

review: Needs Fixing

diff --git a/bin/display_resource.py b/bin/display_resource.py
index 3148603..2a73373 100755
--- a/bin/display_resource.py
+++ b/bin/display_resource.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import os
 import re
 import sys
 import subprocess
@@ -15,8 +16,12 @@ DP_RE = re.compile(r"dp|displayport", re.I)
 
 def main():
     try:
-        xrandr_output = subprocess.check_output(
-            ["xrandr", "-q", "--verbose"], universal_newlines=True)
+        if os.getenv('XDG_SESSION_TYPE') == 'wayland':
+            xrandr_output = subprocess.check_output(
+                ["gnome-randr"], universal_newlines=True)
+        else:
+            xrandr_output = subprocess.check_output(
+                ["xrandr", "-q", "--verbose"], universal_newlines=True)
     except subprocess.CalledProcessError:
         return 0