Merge lp:~brendan-donegan/checkbox/bug1184733 into lp:checkbox

[Brendan Donegan]

The RTC tests were causing some false positives on ARM because they assumed every system should have an RTC with the device name /dev/rtc. This isn't necessarily the case. What's more not every system will have an RTC. Also we weren't really testing the RTC as much as just checking it was there, so this branch modifies the rtc test to actually exercise the RTC (by querying it's current time)

[lp:~brendan-donegan/checkbox/bug1184733]

2465. By Brendan Donegan on 2013-10-22

Change other uses of rtc job

[Daniel Manrique (roadmr)]

Running hwclock -r without sudo results in :

$ hwclock -r
hwclock: Cannot access the Hardware Clock via any known method.
hwclock: Use the --debug option to see the details of our search for an access method.

I think this needs user: root to function properly:

$ sudo hwclock -r
Tue 22 Oct 2013 05:52:07 AM EDT -0.781760 seconds

review: Needs Fixing

[lp:~brendan-donegan/checkbox/bug1184733]

2466. By Brendan Donegan on 2013-10-23

Add root user to rtc job

[Brendan Donegan (brendan-donegan)]

Oh! That's weird - I don't need sudo here to read - just to set. Well, I guess it won't do any harm so - added!

review: Needs Resubmitting

[Daniel Manrique (roadmr)]

hm, can you verify the mode for your rtc device?

$ ls -la /dev/rtc0
crw------- 1 root root 254, 0 Oct 23 09:10 /dev/rtc0

I checked that it's like this on our SUTs so if your permissions are different, they'd seem to be the exception.

review: Needs Information

[Daniel Manrique (roadmr)]

not too important anyway, let's set to root and approve this :)

review: Approve

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-10-18 20:56:12 +0000
+++ checkbox-old/debian/changelog	2013-10-23 09:38:00 +0000
@@ -8,6 +8,12 @@
   * jobs/ethernet.txt.in - added test for running ethtool queries against all 
     devices found on the system.
 
+  [ Brendan Donegan ]
+  * jobs/resources.txt.in, jobs/power-management.txt.in - refactor rtc test so
+    that it actually tests the RTC instead of just checking for its presence.
+    Also create a resource job to allow other jobs to determine if an RTC is
+    present. (LP: #1184733)
+
  -- Sylvain Pineau <[e-mail]>  Fri, 18 Oct 2013 15:36:53 -0400
 
 checkbox (0.16.13) saucy; urgency=low

=== modified file 'checkbox-old/jobs/hibernate.txt.in'
--- checkbox-old/jobs/hibernate.txt.in	2013-10-01 19:28:56 +0000
+++ checkbox-old/jobs/hibernate.txt.in	2013-10-23 09:38:00 +0000
@@ -1,6 +1,8 @@
 plugin: user-interact-verify
 name: power-management/hibernate_advanced
-depends: power-management/rtc
+requires:
+  sleep.disk == 'supported'
+  rtc.state == 'supported'
 environ: CHECKBOX_DATA
 user: root
 command:

=== modified file 'checkbox-old/jobs/power-management.txt.in'
--- checkbox-old/jobs/power-management.txt.in	2013-10-01 19:28:58 +0000
+++ checkbox-old/jobs/power-management.txt.in	2013-10-23 09:38:00 +0000
@@ -130,11 +130,14 @@
 
 plugin: shell
 name: power-management/rtc
-command:
- test -e /dev/rtc || ( echo "ERROR: Real Time Clock not found" >&2 && exit 1 )
+requires:
+  rtc.state == 'supported'
+  package.name == 'util-linux'
+user: root
+command: hwclock -r
 estimated_duration: 0.02
 _description:
- Make sure that the RTC (Real-Time Clock) device exists.
+ Verify that the Real-time clock (RTC) device functions properly, if present
 
 plugin: shell
 name: power-management/tickless_idle

=== modified file 'checkbox-old/jobs/resource.txt.in'
--- checkbox-old/jobs/resource.txt.in	2013-10-17 14:36:03 +0000
+++ checkbox-old/jobs/resource.txt.in	2013-10-23 09:38:00 +0000
@@ -171,3 +171,15 @@
 requires: package.name == "iw"
 estimated_duration: 0.04
 description: Creates resource info for wifi supported interface modes.
+
+name: rtc
+plugin: resource
+command: 
+  if [ -e /sys/class/rtc ]
+  then
+      echo "state: supported"
+  else
+      echo "state: unsupported"
+  fi
+estimated_duration: 0.04
+description: Creates resource info for RTC

=== modified file 'checkbox-old/jobs/stress.txt.in'
--- checkbox-old/jobs/stress.txt.in	2013-10-01 19:28:58 +0000
+++ checkbox-old/jobs/stress.txt.in	2013-10-23 09:38:00 +0000
@@ -11,8 +11,10 @@
 plugin: shell
 name: power-management/hibernate_30_cycles
 depends:
- power-management/rtc
  power-management/hibernate_advanced
+requires:
+ sleep.disk == 'supported'
+ rtc.state == 'supported'
 environ: CHECKBOX_DATA
 user: root
 command:

=== modified file 'checkbox-old/jobs/suspend.txt.in'
--- checkbox-old/jobs/suspend.txt.in	2013-10-17 17:15:29 +0000
+++ checkbox-old/jobs/suspend.txt.in	2013-10-23 09:38:00 +0000
@@ -161,9 +161,9 @@
 
 plugin: user-verify
 name: suspend/suspend_advanced
-depends: power-management/rtc
 requires:
  sleep.mem == 'supported'
+ rtc.state == 'supported'
 user: root
 environ: CHECKBOX_DATA
 command:
@@ -189,9 +189,9 @@
 
 plugin: shell
 name: suspend/suspend_advanced_auto
-depends: power-management/rtc
 requires:
     sleep.mem == 'supported'
+    rtc.state == 'supported'
 _description:
  This is the automated version of suspend/suspend_advanced.
 user: root