From a58096fadebb3379df4969041ada5d9e192cb80a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 13 Oct 2017 11:56:11 +1000 Subject: [PATCH] tools: always print 'dpi' after resolutions We printed '500' but '500x500dpi', let's make this consistent. Signed-off-by: Peter Hutterer --- tools/ratbag-command.c | 2 +- tools/ratbagctl.in | 2 +- tools/ratbagctl.test.in | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/ratbag-command.c b/tools/ratbag-command.c index a63d840e..6491b0af 100644 --- a/tools/ratbag-command.c +++ b/tools/ratbag-command.c @@ -962,7 +962,7 @@ ratbag_cmd_resolution_dpi_get(const struct ratbag_cmd *cmd, resolution = options->resolution; dpi = ratbag_resolution_get_dpi(resolution); - printf("%d\n", dpi); + printf("%ddpi\n", dpi); return SUCCESS; } diff --git a/tools/ratbagctl.in b/tools/ratbagctl.in index c42d81a3..446c2bef 100755 --- a/tools/ratbagctl.in +++ b/tools/ratbagctl.in @@ -418,7 +418,7 @@ def func_dpi_get(r, args): if RatbagdResolution.CAP_SEPARATE_XY_RESOLUTION in r.capabilities: print("{}x{}dpi".format(r.resolution[0], r.resolution[1])) else: - print(r.resolution[0]) + print("{}dpi".format(r.resolution[0])) def func_dpi_set(r, args): diff --git a/tools/ratbagctl.test.in b/tools/ratbagctl.test.in index f89825ba..bfdff4ac 100755 --- a/tools/ratbagctl.test.in +++ b/tools/ratbagctl.test.in @@ -278,7 +278,7 @@ class TestRatbagCtlDPI(TestRatbagCtl): def test_dpi_get(self): command = "DPI get" r = self.launch_good_test(command + " test_device") - self.assertEqual(int(r), 200) + self.assertEqual(int(r[:-3]), 200) # drop 'dpi' suffix self.setProfile(1) r = self.launch_good_test(command + " test_device") self.assertEqual(r, "1300x1400dpi") @@ -290,11 +290,11 @@ class TestRatbagCtlDPI(TestRatbagCtl): command = "DPI set" self.setProfile(0) r = self.launch_good_test("DPI get test_device") - res = int(r) + 50 + res = int(r[:-3]) + 50 # drop 'dpi' suffix r = self.launch_good_test(command + " {} test_device".format(res)) self.assertEqual(r, '') r = self.launch_good_test("DPI get test_device") - self.assertEqual(int(r), res) + self.assertEqual(int(r[:-3]), res) # drop 'dpi' suffix self.launch_fail_test(command) self.launch_fail_test(command + " X test_device") self.launch_fail_test(command + " 100 test_device X") @@ -325,7 +325,7 @@ class TestRatbagCtlDPI(TestRatbagCtl): r = self.launch_good_test("Profile 1 Resolution 1 DPI get test_device") self.assertEqual(r, "1200x1300dpi") r = self.launch_good_test("Resolution 2 DPI get test_device") - self.assertEqual(int(r), 300) + self.assertEqual(int(r[:-3]), 300) # drop 'dpi' suffix self.launch_fail_test("Profile 1 Profile 1 DPI get test_device") self.launch_fail_test("Profile 1 Resolution 1 Resolution 2 DPI get test_device")