From 2a36abda829f489f5079661eadd5ed6a9f4fc265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Wed, 14 Feb 2024 19:30:31 +0100
Subject: [PATCH] tests: Add utility function to eventually check active
 profile

---
 tests/integration_test.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/integration_test.py b/tests/integration_test.py
index 6158bc5..8f71f3c 100644
--- a/tests/integration_test.py
+++ b/tests/integration_test.py
@@ -405,6 +405,14 @@ class Tests(dbusmock.DBusTestCase):
             + "but '{self.read_sysfs_attr(device, attribute)}'",
         )
 
+    def assert_dbus_property_eventually_is(self, prop, value, timeout=1200):
+        """Asserts that a dbus property eventually is what expected"""
+        return self.assert_eventually(
+            lambda: self.get_dbus_property(prop) == value,
+            timeout=timeout,
+            message=f"property '{prop}' is not '{value}', but '{self.get_dbus_property(prop)}'",
+        )
+
     #
     # Actual test cases
     #
@@ -1240,16 +1248,12 @@ class Tests(dbusmock.DBusTestCase):
 
         # lapmode detected
         self.testbed.set_attribute(self.tp_acpi, "dytc_lapmode", "1\n")
-        self.assert_eventually(
-            lambda: self.get_dbus_property("PerformanceDegraded") == "lap-detected"
-        )
+        self.assert_dbus_property_eventually_is("PerformanceDegraded", "lap-detected")
         self.assertEqual(self.get_dbus_property("ActiveProfile"), "performance")
 
         # Reset lapmode
         self.testbed.set_attribute(self.tp_acpi, "dytc_lapmode", "0\n")
-        self.assert_eventually(
-            lambda: self.get_dbus_property("PerformanceDegraded") == ""
-        )
+        self.assert_dbus_property_eventually_is("PerformanceDegraded", "")
 
         # Performance mode didn't change
         self.assertEqual(self.get_dbus_property("ActiveProfile"), "performance")
@@ -1267,9 +1271,7 @@ class Tests(dbusmock.DBusTestCase):
             self.testbed.get_root_dir(), "sys/firmware/acpi/platform_profile"
         )
         self.write_file_contents(platform_profile, "performance\n")
-        self.assert_eventually(
-            lambda: self.get_dbus_property("ActiveProfile") == "performance"
-        )
+        self.assert_dbus_property_eventually_is("ActiveProfile", "performance")
 
     def test_fake_driver(self):
         """Test that the fake driver works"""
@@ -1767,9 +1769,7 @@ class Tests(dbusmock.DBusTestCase):
             os.path.join(acpi_dir, "platform_profile"), "performance\n"
         )
 
-        self.assert_eventually(
-            lambda: self.get_dbus_property("ActiveProfile") == "power-saver"
-        )
+        self.assert_dbus_property_eventually_is("ActiveProfile", "power-saver")
         self.stop_daemon()
 
     def test_not_allowed_profile(self):