Merge lp:~cypressyew/checkbox-certification/prepare-fix into lp:checkbox-certification

[Po-Hsu Lin]

Fixed some error message while running on 14.04

[lp:~cypressyew/checkbox-certification/prepare-fix]

653. By Po-Hsu Lin on 2014-06-10

Missing changelog added

[Daniel Manrique (roadmr)]

Great work! I made a comment on line 43 (see below), a small fix is needed there, once that's done we can merge this.

review: Approve

[Daniel Manrique (roadmr)]

er, meant that to be "needs fixing".

review: Needs Fixing

[Zygmunt Krynicki (zyga)]

Just an inline comment

[Daniel Manrique (roadmr)]

A reply inline.

[lp:~cypressyew/checkbox-certification/prepare-fix]

654. By Po-Hsu Lin on 2014-06-11

Typo fix

[Po-Hsu Lin (cypressyew)]

Typo fixed, thanks

Also, the idle-delay key not only could be found in 14.04, but also 12.04
However, we don't need to change that in 12.04, so I added an if statement as suggested.

review: Needs Resubmitting

[Daniel Manrique (roadmr)]

Thanks! This is OK, we can later think if we want to revisit the prepare script.

review: Approve

=== modified file 'bin/checkbox-certification-prepare'
--- bin/checkbox-certification-prepare	2014-02-05 07:15:31 +0000
+++ bin/checkbox-certification-prepare	2014-06-11 02:08:42 +0000
@@ -15,7 +15,8 @@
     iperf
 
 #Disable checkbox autostart on boot
-sudo rm /etc/xdg/autostart/checkbox-certification-client.desktop
+[ -f /etc/xdg/autostart/checkbox-certification-client.desktop ] && \
+    sudo rm /etc/xdg/autostart/checkbox-certification-client.desktop
 
 #Remove the static declaration and re-enable network manager
 #Wait 3 second to allow NetworkManager to re-enable
@@ -50,7 +51,8 @@
 fi
 echo "Submission ID is $submission_id"
 #Remove old submission after extracting submission_id
-mv .checkbox checkbox-functional-`date +%s`
+[ -d ~/.checkbox ] && mv ~/.checkbox ~/checkbox-functional-`date +%s`
+[ -d ~/.cache/plainbox ] && mv ~/.cache/plainbox ~/plainbox-functional-`date +%s`
 
 cat << EOF2 > ~/actually-run-checkbox-stress.sh
 checkbox-certification-client \
@@ -67,7 +69,8 @@
 chmod 755 ~/prepare-checkbox-stress.sh
 
 #Move the old .checkbox directory out of the way (has old test results)
-mv .checkbox auto-checkbox-run
+[ -d ~/.checkbox ] && mv ~/.checkbox ~/auto-checkbox-run
+[ -d ~/.cache/plainbox ] && mv ~/.cache/plainbox ~/auto-plainbox-run
 
 #Prepare scripts to do preliminary suspend and hibernate runs using rtcwake
 #and date command to determine sleep times.
@@ -101,7 +104,13 @@
 gsettings set org.gnome.desktop.screensaver lock-enabled false
 gsettings set org.gnome.desktop.screensaver ubuntu-lock-on-suspend false
 gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
-gsettings set org.gnome.settings-daemon.plugins.power sleep-display-ac 0
+if [ "`lsb_release -rs | awk -F '.' '{print$1}'`" -lt 14 ]; then
+    # for Ubuntu older than 14.04
+    gsettings set org.gnome.settings-daemon.plugins.power sleep-display-ac 0
+else
+    # for 14.04 or newer
+    gsettings set org.gnome.desktop.session idle-delay 0
+fi
 
 #Get rid of old crash reports
 sudo rm -rf /var/crash/*

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-06 20:26:02 +0000
+++ debian/changelog	2014-06-11 02:08:42 +0000
@@ -1,5 +1,9 @@
 checkbox-certification (0.20) UNRELEASED; urgency=medium
 
+  [ Po-Hsu Lin ]
+  * bin/checkbox-certification-prepare - Fix some file not found and key value
+    does not exist errors when running on 14.04.
+
   [ Brendan Donegan ]
   * Remove postinstall file for checkbox-certification-tools which referenced
     checkbox, the dependency for which is no longer there (LP: #1327146)