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

Proposed by Po-Hsu Lin
Status: Merged
Approved by: Daniel Manrique
Approved revision: 654
Merged at revision: 652
Proposed branch: lp:~cypressyew/checkbox-certification/prepare-fix
Merge into: lp:checkbox-certification
Diff against target: 62 lines (+17/-4)
2 files modified
bin/checkbox-certification-prepare (+13/-4)
debian/changelog (+4/-0)
To merge this branch: bzr merge lp:~cypressyew/checkbox-certification/prepare-fix
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Po-Hsu Lin Needs Resubmitting
Review via email: mp+222582@code.launchpad.net

Description of the change

Fixed some error message while running on 14.04

To post a comment you must log in.
653. By Po-Hsu Lin

Missing changelog added

Revision history for this message
Daniel Manrique (roadmr) wrote :

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
Revision history for this message
Daniel Manrique (roadmr) wrote :

er, meant that to be "needs fixing".

review: Needs Fixing
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Just an inline comment

Revision history for this message
Daniel Manrique (roadmr) wrote :

A reply inline.

654. By Po-Hsu Lin

Typo fix

Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

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
Revision history for this message
Daniel Manrique (roadmr) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
15 iperf15 iperf
1616
17#Disable checkbox autostart on boot17#Disable checkbox autostart on boot
18sudo rm /etc/xdg/autostart/checkbox-certification-client.desktop18[ -f /etc/xdg/autostart/checkbox-certification-client.desktop ] && \
19 sudo rm /etc/xdg/autostart/checkbox-certification-client.desktop
1920
20#Remove the static declaration and re-enable network manager21#Remove the static declaration and re-enable network manager
21#Wait 3 second to allow NetworkManager to re-enable22#Wait 3 second to allow NetworkManager to re-enable
@@ -50,7 +51,8 @@
50fi51fi
51echo "Submission ID is $submission_id"52echo "Submission ID is $submission_id"
52#Remove old submission after extracting submission_id53#Remove old submission after extracting submission_id
53mv .checkbox checkbox-functional-`date +%s`54[ -d ~/.checkbox ] && mv ~/.checkbox ~/checkbox-functional-`date +%s`
55[ -d ~/.cache/plainbox ] && mv ~/.cache/plainbox ~/plainbox-functional-`date +%s`
5456
55cat << EOF2 > ~/actually-run-checkbox-stress.sh57cat << EOF2 > ~/actually-run-checkbox-stress.sh
56checkbox-certification-client \58checkbox-certification-client \
@@ -67,7 +69,8 @@
67chmod 755 ~/prepare-checkbox-stress.sh69chmod 755 ~/prepare-checkbox-stress.sh
6870
69#Move the old .checkbox directory out of the way (has old test results)71#Move the old .checkbox directory out of the way (has old test results)
70mv .checkbox auto-checkbox-run72[ -d ~/.checkbox ] && mv ~/.checkbox ~/auto-checkbox-run
73[ -d ~/.cache/plainbox ] && mv ~/.cache/plainbox ~/auto-plainbox-run
7174
72#Prepare scripts to do preliminary suspend and hibernate runs using rtcwake75#Prepare scripts to do preliminary suspend and hibernate runs using rtcwake
73#and date command to determine sleep times.76#and date command to determine sleep times.
@@ -101,7 +104,13 @@
101gsettings set org.gnome.desktop.screensaver lock-enabled false104gsettings set org.gnome.desktop.screensaver lock-enabled false
102gsettings set org.gnome.desktop.screensaver ubuntu-lock-on-suspend false105gsettings set org.gnome.desktop.screensaver ubuntu-lock-on-suspend false
103gsettings set org.gnome.desktop.screensaver idle-activation-enabled false106gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
104gsettings set org.gnome.settings-daemon.plugins.power sleep-display-ac 0107if [ "`lsb_release -rs | awk -F '.' '{print$1}'`" -lt 14 ]; then
108 # for Ubuntu older than 14.04
109 gsettings set org.gnome.settings-daemon.plugins.power sleep-display-ac 0
110else
111 # for 14.04 or newer
112 gsettings set org.gnome.desktop.session idle-delay 0
113fi
105114
106#Get rid of old crash reports115#Get rid of old crash reports
107sudo rm -rf /var/crash/*116sudo rm -rf /var/crash/*
108117
=== 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 @@
1checkbox-certification (0.20) UNRELEASED; urgency=medium1checkbox-certification (0.20) UNRELEASED; urgency=medium
22
3 [ Po-Hsu Lin ]
4 * bin/checkbox-certification-prepare - Fix some file not found and key value
5 does not exist errors when running on 14.04.
6
3 [ Brendan Donegan ]7 [ Brendan Donegan ]
4 * Remove postinstall file for checkbox-certification-tools which referenced8 * Remove postinstall file for checkbox-certification-tools which referenced
5 checkbox, the dependency for which is no longer there (LP: #1327146)9 checkbox, the dependency for which is no longer there (LP: #1327146)

Subscribers

People subscribed via source and target branches