From 3d69541c675faf77efa26f68cc69e781f09f2b92 Mon Sep 17 00:00:00 2001
From: Sylvain Pineau <sylvain.pineau@canonical.com>
Date: Tue, 14 Jul 2020 13:10:10 +0200
Subject: bin:resolution_test -> resolution_test.py

---
 bin/resolution_test       | 50 -----------------------------------------------
 bin/resolution_test.py    | 50 +++++++++++++++++++++++++++++++++++++++++++++++
 units/graphics/jobs.pxu   |  4 ++--
 units/graphics/legacy.pxu |  4 ++--
 4 files changed, 54 insertions(+), 54 deletions(-)
 delete mode 100755 bin/resolution_test
 create mode 100755 bin/resolution_test.py

diff --git a/bin/resolution_test b/bin/resolution_test
deleted file mode 100755
index 55a7828..0000000
--- a/bin/resolution_test
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env python3
-
-import gi
-import sys
-
-from argparse import ArgumentParser
-gi.require_version('Gdk', '3.0')
-from gi.repository import Gdk
-
-
-def check_resolution():
-    screen = Gdk.Screen.get_default()
-    n = screen.get_n_monitors()
-    for i in range(n):
-        geom = screen.get_monitor_geometry(i)
-        print('Monitor %d:' % (i + 1))
-        print('  %d x %d' % (geom.width, geom.height))
-
-
-def compare_resolution(min_h, min_v):
-    # Evaluate just the primary display
-    screen = Gdk.Screen.get_default()
-    geom = screen.get_monitor_geometry(screen.get_primary_monitor())
-    print("Minimum acceptable display resolution: %d x %d" % (min_h, min_v))
-    print("Detected display resolution: %d x %d" % (geom.width, geom.height))
-    return geom.width >= min_h and geom.height >= min_v
-
-
-def main():
-    parser = ArgumentParser()
-    parser.add_argument("--horizontal",
-        type=int,
-        default=0,
-        help="Minimum acceptable horizontal resolution.")
-    parser.add_argument("--vertical",
-        type=int,
-        default=0,
-        help="Minimum acceptable vertical resolution.")
-    args = parser.parse_args()
-
-    if (args.horizontal > 0) and (args.vertical > 0):
-        return not compare_resolution(args.horizontal, args.vertical)
-    else:
-        check_resolution()
-
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())
diff --git a/bin/resolution_test.py b/bin/resolution_test.py
new file mode 100755
index 0000000..55a7828
--- /dev/null
+++ b/bin/resolution_test.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+
+import gi
+import sys
+
+from argparse import ArgumentParser
+gi.require_version('Gdk', '3.0')
+from gi.repository import Gdk
+
+
+def check_resolution():
+    screen = Gdk.Screen.get_default()
+    n = screen.get_n_monitors()
+    for i in range(n):
+        geom = screen.get_monitor_geometry(i)
+        print('Monitor %d:' % (i + 1))
+        print('  %d x %d' % (geom.width, geom.height))
+
+
+def compare_resolution(min_h, min_v):
+    # Evaluate just the primary display
+    screen = Gdk.Screen.get_default()
+    geom = screen.get_monitor_geometry(screen.get_primary_monitor())
+    print("Minimum acceptable display resolution: %d x %d" % (min_h, min_v))
+    print("Detected display resolution: %d x %d" % (geom.width, geom.height))
+    return geom.width >= min_h and geom.height >= min_v
+
+
+def main():
+    parser = ArgumentParser()
+    parser.add_argument("--horizontal",
+        type=int,
+        default=0,
+        help="Minimum acceptable horizontal resolution.")
+    parser.add_argument("--vertical",
+        type=int,
+        default=0,
+        help="Minimum acceptable vertical resolution.")
+    args = parser.parse_args()
+
+    if (args.horizontal > 0) and (args.vertical > 0):
+        return not compare_resolution(args.horizontal, args.vertical)
+    else:
+        check_resolution()
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index 20eda41..652eeea 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -68,7 +68,7 @@ id: graphics/{index}_resolution_{product_slug}
 requires:
  device.category == 'VIDEO'
  package.name == 'zenity'
-command: resolution_test | zenity --text-info
+command: resolution_test.py | zenity --text-info
 estimated_duration: 10.00
 _summary: Test default resolution for {vendor} {product}
 _description:
@@ -109,7 +109,7 @@ requires:
  device.category == 'VIDEO'
 command:
  source graphics_env.sh {driver} {index}
- resolution_test --horizontal 800 --vertical 600
+ resolution_test.py --horizontal 800 --vertical 600
 estimated_duration: 0.331
 _summary: Test that {vendor} {product} meets minimum resolution requirement
 _description:
diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu
index c254476..1970287 100644
--- a/units/graphics/legacy.pxu
+++ b/units/graphics/legacy.pxu
@@ -29,7 +29,7 @@ id: graphics/resolution
 requires:
  device.category == 'VIDEO'
 flags: deprecated
-command: resolution_test
+command: resolution_test.py
 estimated_duration: 0.750
 _summary: Test default resolution (for old checkbox)
 _description:
@@ -64,7 +64,7 @@ category_id: com.canonical.plainbox::graphics
 id: graphics/minimum_resolution
 requires:
  device.category == 'VIDEO'
-command: resolution_test --horizontal 800 --vertical 600
+command: resolution_test.py --horizontal 800 --vertical 600
 estimated_duration: 0.331
 _summary: Test that system meets minimum resolution requirement
 _description:
-- 
cgit v1.2.3