Update test scripts to use login1 for suspend and hibernate where necessary

diff --git a/tests/scripts/power-no-console-kit.conf b/tests/scripts/power-no-console-kit.conf
index e346add47b64df23c139da26ab11096d02a6dfd3..9d10428c28ebc7ad2d7921d5dda0be55cf7eb3ec 100644 (file)
--- a/tests/scripts/power-no-console-kit.conf
+++ b/tests/scripts/power-no-console-kit.conf
@@ -26,21 +26,21 @@ minimum-display-number=50
 
 # See if can suspend
 #?*GREETER :50 GET-CAN-SUSPEND
-#?UPOWER SUSPEND-ALLOWED
+#?LOGIN1 CAN-SUSPEND
 #?GREETER :50 CAN-SUSPEND ALLOWED=TRUE
 
 # Suspend
 #?*GREETER :50 SUSPEND
-#?UPOWER SUSPEND
+#?LOGIN1 SUSPEND
 
 # See if can hibernate
 #?*GREETER :50 GET-CAN-HIBERNATE
-#?UPOWER HIBERNATE-ALLOWED
+#?LOGIN1 CAN-HIBERNATE
 #?GREETER :50 CAN-HIBERNATE ALLOWED=TRUE
 
 # Hibernate
 #?*GREETER :50 HIBERNATE
-#?UPOWER HIBERNATE
+#?LOGIN1 HIBERNATE
 
 # See if can restart
 #?*GREETER :50 GET-CAN-RESTART

diff --git a/tests/scripts/power.conf b/tests/scripts/power.conf
index a068fe98db3825eeae1df0288f9f88a7673dbd8a..32ccae473cd759e08d8663d40e113f79fa2ddf98 100644 (file)
--- a/tests/scripts/power.conf
+++ b/tests/scripts/power.conf
@@ -23,21 +23,21 @@ minimum-display-number=50
 
 # See if can suspend
 #?*GREETER :50 GET-CAN-SUSPEND
-#?UPOWER SUSPEND-ALLOWED
+#?LOGIN1 CAN-SUSPEND
 #?GREETER :50 CAN-SUSPEND ALLOWED=TRUE
 
 # Suspend
 #?*GREETER :50 SUSPEND
-#?UPOWER SUSPEND
+#?LOGIN1 SUSPEND
 
 # See if can hibernate
 #?*GREETER :50 GET-CAN-HIBERNATE
-#?UPOWER HIBERNATE-ALLOWED
+#?LOGIN1 CAN-HIBERNATE
 #?GREETER :50 CAN-HIBERNATE ALLOWED=TRUE
 
 # Hibernate
 #?*GREETER :50 HIBERNATE
-#?UPOWER HIBERNATE
+#?LOGIN1 HIBERNATE
 
 # See if can restart
 #?*GREETER :50 GET-CAN-RESTART