Checkbox

Merge lp:~bladernr/checkbox/checkbox-bug-fixes into lp:checkbox

  1. checkbox-bug-fixes
  2. Merge into trunk
Proposed by Jeff Lane 
Status: Merged
Merged at revision: 893
Proposed branch: lp:~bladernr/checkbox/checkbox-bug-fixes
Merge into: lp:checkbox
Diff against target: 142 lines (+27/-13)
4 files modified
debian/changelog (+5/-1)
jobs/firewire.txt.in (+2/-1)
jobs/sleep.txt.in (+4/-4)
po/checkbox.pot (+16/-7)
To merge this branch: bzr merge lp:~bladernr/checkbox/checkbox-bug-fixes
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+53113@code.launchpad.net

Description of the change

Fixes for LP: 693068 and 420493. Changelog updated appropriately.

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

Looks good, merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-11 23:58:46 +0000
3+++ debian/changelog 2011-03-12 01:37:53 +0000
4@@ -10,7 +10,11 @@
5 [Jochen Kemnade]
6 * Fixed grammar in user-apps tests (LP: #642001)
7
8- -- Marc Tardif <marc@ubuntu.com> Fri, 11 Mar 2011 15:17:06 -0500
9+ [Jeff Lane]
10+ * Added reboot instructions to suspend/hibernate tests (LP: #420493)
11+ * Made the firewire instructions make more sense (LP: #693068)
12+
13+ -- Jeff Lane <jeff@ubuntu.com> Fri, 11 Mar 2011 19:26:00 -0500
14
15 checkbox (0.11.1) natty; urgency=low
16
17
18=== modified file 'jobs/firewire.txt.in'
19--- jobs/firewire.txt.in 2010-07-02 18:35:10 +0000
20+++ jobs/firewire.txt.in 2011-03-12 01:37:53 +0000
21@@ -4,7 +4,8 @@
22 Firewire HDD verification procedure:
23 1.- Plug a Firewire HDD into the computer
24 2.- A window should be opened asking which action should be performed (open folder, photo manager, etc).
25- 3.- Copy some files from the internal/firewire HDD to the firewire/internal HDD
26+ 3.- Copy some files from your internal HDD to the firewire HDD.
27+ 4.- Copy some files from the firewire HDD to your internal HDD.
28 .
29 Do the copy operations work as expected?
30
31
32=== modified file 'jobs/sleep.txt.in'
33--- jobs/sleep.txt.in 2011-03-11 21:34:47 +0000
34+++ jobs/sleep.txt.in 2011-03-12 01:37:53 +0000
35@@ -66,7 +66,7 @@
36 _description:
37 Power management Suspend and Resume test
38 .
39- Select test and your system will suspend for about 30 - 60 seconds. If your system does not wake itself up after 60 seconds, please press the power button momentarily to wake the system manually.
40+ Select test and your system will suspend for about 30 - 60 seconds. If your system does not wake itself up after 60 seconds, please press the power button momentarily to wake the system manually. If your system fails to wake at all and must be rebooted, restart System Testing after reboot and mark this test as Failed.
41 user: root
42 command: sleep_test -d
43
44@@ -163,7 +163,7 @@
45 user: root
46 command: sleep_test -i 30 -s mem --debug
47 _description:
48- Enter and resume from suspend state for 30 iterations. Please note that this is a lengthy test. Select Test to begin.
49+ Enter and resume from suspend state for 30 iterations. Please note that this is a lengthy test. Select Test to begin. If your system fails to wake and must be rebooted, please restart System Testing and mark this test as Failed.
50 .
51 Did the system successfully suspend and resume for 30 iterations?
52
53@@ -174,7 +174,7 @@
54 _description:
55 This will check to make sure your system can successfully hibernate (if supported).
56 .
57- Select Test to begin. The system will hibernate and should wake itself within 5 minutes. If your system does not wake itself after 5 minutes, please press the power button to wake the system manually.
58+ Select Test to begin. The system will hibernate and should wake itself within 5 minutes. If your system does not wake itself after 5 minutes, please press the power button to wake the system manually. If the system fails to resume from hibernate, please restart System Testing and mark this test as Failed.
59 .
60 Did the system successfully hibernate and did it work properly after waking up?
61
62@@ -185,7 +185,7 @@
63 user: root
64 command: sleep_test -i 30 -s disk -w 120 --debug
65 _description:
66- Enter and resume from hibernate for 30 iterations. Please note that this is a very lengthy test. Also, if your system does not wake itself after 2 minutes, you will need to press the power button to wake the system up.
67+ Enter and resume from hibernate for 30 iterations. Please note that this is a very lengthy test. Also, if your system does not wake itself after 2 minutes, you will need to press the power button to wake the system up. If the system fails to resume from hibernation and must be rebooted, please restart System Testing and mark this test as Failed.
68 .
69 Also, you will need to ensure your system has no power-on or HDD passwords set, and that grub is set to boot Ubuntu by default if you have a multi-boot set-up.
70 .
71
72=== modified file 'po/checkbox.pot'
73--- po/checkbox.pot 2011-03-11 21:38:11 +0000
74+++ po/checkbox.pot 2011-03-12 01:37:53 +0000
75@@ -8,10 +8,11 @@
76 msgstr ""
77 "Project-Id-Version: PACKAGE VERSION\n"
78 "Report-Msgid-Bugs-To: \n"
79-"POT-Creation-Date: 2011-03-11 16:36-0500\n"
80+"POT-Creation-Date: 2011-03-11 19:27-0500\n"
81 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
82 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
83 "Language-Team: LANGUAGE <LL@li.org>\n"
84+"Language: \n"
85 "MIME-Version: 1.0\n"
86 "Content-Type: text/plain; charset=CHARSET\n"
87 "Content-Transfer-Encoding: 8bit\n"
88@@ -184,8 +185,9 @@
89 msgid ""
90 "Firewire HDD verification procedure: 1.- Plug a Firewire HDD into the "
91 "computer 2.- A window should be opened asking which action should be "
92-"performed (open folder, photo manager, etc). 3.- Copy some files from the "
93-"internal/firewire HDD to the firewire/internal HDD"
94+"performed (open folder, photo manager, etc). 3.- Copy some files from your "
95+"internal HDD to the firewire HDD. 4.- Copy some files from the firewire HDD "
96+"to your internal HDD."
97 msgstr ""
98
99 #. description
100@@ -524,7 +526,9 @@
101 msgid ""
102 "Select test and your system will suspend for about 30 - 60 seconds. If your "
103 "system does not wake itself up after 60 seconds, please press the power "
104-"button momentarily to wake the system manually."
105+"button momentarily to wake the system manually. If your system fails to wake "
106+"at all and must be rebooted, restart System Testing after reboot and mark "
107+"this test as Failed."
108 msgstr ""
109
110 #. description
111@@ -606,7 +610,8 @@
112 #: ../jobs/sleep.txt.in:165
113 msgid ""
114 "Enter and resume from suspend state for 30 iterations. Please note that this "
115-"is a lengthy test. Select Test to begin."
116+"is a lengthy test. Select Test to begin. If your system fails to wake and "
117+"must be rebooted, please restart System Testing and mark this test as Failed."
118 msgstr ""
119
120 #. description
121@@ -626,7 +631,9 @@
122 msgid ""
123 "Select Test to begin. The system will hibernate and should wake itself "
124 "within 5 minutes. If your system does not wake itself after 5 minutes, "
125-"please press the power button to wake the system manually."
126+"please press the power button to wake the system manually. If the system "
127+"fails to resume from hibernate, please restart System Testing and mark this "
128+"test as Failed."
129 msgstr ""
130
131 #. description
132@@ -641,7 +648,9 @@
133 msgid ""
134 "Enter and resume from hibernate for 30 iterations. Please note that this is "
135 "a very lengthy test. Also, if your system does not wake itself after 2 "
136-"minutes, you will need to press the power button to wake the system up."
137+"minutes, you will need to press the power button to wake the system up. If "
138+"the system fails to resume from hibernation and must be rebooted, please "
139+"restart System Testing and mark this test as Failed."
140 msgstr ""
141
142 #. description

Subscribers

People subscribed via source and target branches