Merge lp:~sylvain-pineau/checkbox/bug1068799 into lp:checkbox

[Sylvain Pineau]

Fixed path to the /proc acpi lid button in power-management jobs

This MR fixes the path to the /proc acpi lid button in power-management jobs.

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-22 20:42:58 +0000
+++ debian/changelog	2012-10-23 09:53:22 +0000
@@ -58,6 +58,8 @@
     --memorycard. stress/sdhc and stress/usb run with root privileges to mount
     all partitions (LP: #1065862)
   * [FEATURE] jobs/stress.txt.in: Added a wireless hotkey stress test.
+  * jobs/power-management.txt.in: Fixed path to the /proc acpi lid button
+    (LP: #1068799)
 
   [Zygmunt Krynicki]
   * scripts/removable_storage_watcher - properly detect removal of 'firewire',

=== modified file 'jobs/power-management.txt.in'
--- jobs/power-management.txt.in	2012-10-09 15:21:35 +0000
+++ jobs/power-management.txt.in	2012-10-23 09:53:22 +0000
@@ -91,7 +91,7 @@
 requires: device.product == 'Lid Switch'
 command:
  for i in `seq 20`; do
-  state=`cat /proc/acpi/button/lid/LID/state | awk '{print $2}'`
+  state=`cat /proc/acpi/button/lid/*/state | awk '{print $2}'`
   [ "$state" = "closed" ] && exit 0 || sleep 0.5
  done
  exit 1
@@ -109,7 +109,7 @@
 requires: device.product == 'Lid Switch'
 command:
  for i in `seq 20`; do
-  state=`cat /proc/acpi/button/lid/LID/state | awk '{print $2}'`
+  state=`cat /proc/acpi/button/lid/*/state | awk '{print $2}'`
   [ "$state" = "open" ] && exit 0 || sleep 0.5
  done
  exit 1