Merge lp:~cr3/checkbox/438671 into lp:checkbox

[Marc Tardif]

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-26 16:17:55 +0000
+++ debian/changelog	2009-10-27 14:40:20 +0000
@@ -1,3 +1,10 @@
+checkbox (0.8.6) karmic; urgency=low
+
+  * Fixed strings in fingerprint and modem tests (LP: #457759)
+  * Fixed client side validation of Launchpad form (LP: #438671)
+
+ -- Marc Tardif <[e-mail]>  Tue, 27 Oct 2009 10:32:09 -0400
+
 checkbox (0.8.5) karmic; urgency=low
 
   * Fixed translation of suites and tests files (LP: #456115)
 
=== modified file 'plugins/launchpad_exchange.py'
--- plugins/launchpad_exchange.py	2009-05-12 00:38:17 +0000
+++ plugins/launchpad_exchange.py	2009-10-27 14:40:20 +0000
@@ -30,10 +30,25 @@
 from checkbox.lib.log import format_delta
 from checkbox.lib.transport import HTTPTransport
 
-from checkbox.properties import Int, String
+from checkbox.properties import Int, Map, String
 from checkbox.plugin import Plugin
 
 
+FORM = Map({
+    "field.private": String(),
+    "field.contactable": String(),
+    "field.format": String(),
+    "field.actions.upload": String(),
+    "field.architecture": String(),
+    "field.date_created": String(),
+    "field.distribution": String(),
+    "field.distroseries": String(),
+    "field.submission_key": String(),
+    "field.system": String(),
+    "field.emailaddress": String(),
+    "field.live_cd": String()})
+
+
 class LaunchpadExchange(Plugin):
 
     # Timeout value for each submission.
@@ -46,11 +61,11 @@
         super(LaunchpadExchange, self).register(manager)
         self._headers = {}
         self._form = {
-            "field.private": False,
-            "field.contactable": False,
-            "field.live_cd": False,
-            "field.format": u"VERSION_1",
-            "field.actions.upload": u"Upload"}
+            "field.private": "False",
+            "field.contactable": "False",
+            "field.live_cd": "False",
+            "field.format": "VERSION_1",
+            "field.actions.upload": "Upload"}
 
         for (rt, rh) in [
              ("report-architecture", self.report_architecture),
@@ -92,9 +107,12 @@
 
     def launchpad_exchange(self):
         # Encode form data
-        form = {}
-        for field, value in self._form.items():
-            form[field] = str(value).encode("UTF-8")
+        try:
+            form = FORM.coerce(self._form)
+        except ValueError, e:
+            self._manager.reactor.fire("exchange-error", _("""\
+Failed to process form: %s""" % e))
+            return
 
         # Compress and add payload to form
         payload = open(self._launchpad_report, "r").read()
 
=== modified file 'po/checkbox.pot'
--- po/checkbox.pot	2009-10-26 15:52:11 +0000
+++ po/checkbox.pot	2009-10-27 14:40:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-26 10:27-0400\n"
+"POT-Creation-Date: 2009-10-27 10:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -207,7 +207,7 @@
 #. description
 #: ../tests/fingerprint.txt.in:3
 msgid ""
-"Fingerprint unlock verification procedure: 1.- Click on the user switcher "
+"Fingerprint login verification procedure: 1.- Click on the user switcher "
 "applet 2.- Select your user name 3.- A window should appear that provides "
 "the ability to login either \\ typing your password or using fingerprint "
 "authentication 4.- Use the fingerprint reader to login 5.- Click on the user "
@@ -218,10 +218,10 @@
 #: ../tests/fingerprint.txt.in:21
 msgid ""
 "Fingerprint unlock verification procedure: 1.- Click on the user switcher "
-"applet 2.- Select 'Lock screen' 3.- Press any key or move the mouse 3.- A "
+"applet 2.- Select 'Lock screen' 3.- Press any key or move the mouse 4.- A "
 "window should appear that provides the ability to unlock either \\ typing "
-"your password or using fingerprint authentication 4.- Use the fingerprint "
-"reader to unlock 5.- Screen should be unlocked"
+"your password or using fingerprint authentication 5.- Use the fingerprint "
+"reader to unlock 6.- Screen should be unlocked"
 msgstr ""
 
 #. description
@@ -284,17 +284,20 @@
 #. description
 #: ../tests/network.txt.in:26
 msgid ""
-"Built-in modem network connection procedure: 1.- Connect the telephone line "
-"to the computer 2.- Right click on the Network Manager applet 3.- Select "
-"'Edit Connections' 4.- Select the 'DSL' tab 5.- Click on add 'Add' button "
-"6.- Configure the connection parameters properly 7.- Notify OSD should "
-"confirm that the connection has been established 8.- Select Test to verify "
-"that it's possible to establish both http \\ and ftp connections"
+"Built-in modem network connection procedure: 1.- Open System -> "
+"Administration -> Network 2.- Press Unlock and type your password to unlock "
+"the settings 3.- Select the Connections tab. 4.- Select Point to point "
+"connection and press Properties. 5.- Tick Enable this connection 6.- Choose "
+"Serial Modem from the Connection Type drop down. 7.- Under Internet Service "
+"Provider data, enter the phone number and dial prefix. 8.- Under Account "
+"Data enter your password and username. 9.- Click the Modem tab. 10.- Choose "
+"the modem settings you require. 11.- Click OK. 12.- Select the DNS tab and "
+"enter the DNS addresses of your ISP. 13.- Click Close."
 msgstr ""
 
 #. description
 #: ../tests/network.txt.in:26
-msgid "Was the connection correctly established?"
+msgid "Can you successfully establish a network connection?"
 msgstr ""
 
 #. description
@@ -563,7 +566,12 @@
 "your system."
 msgstr ""
 
-#: ../plugins/launchpad_exchange.py:118
+#: ../plugins/launchpad_exchange.py:113
+#, python-format
+msgid "Failed to process form: %s"
+msgstr ""
+
+#: ../plugins/launchpad_exchange.py:136
 #, python-format
 msgid ""
 "Failed to contact server. Please try\n"
@@ -574,13 +582,13 @@
 "https://launchpad.net/+hwdb/+submit"
 msgstr ""
 
-#: ../plugins/launchpad_exchange.py:127
+#: ../plugins/launchpad_exchange.py:145
 msgid ""
 "Failed to upload to server,\n"
 "please try again later."
 msgstr ""
 
-#: ../plugins/launchpad_exchange.py:139
+#: ../plugins/launchpad_exchange.py:157
 msgid "Information not posted to Launchpad."
 msgstr ""
 
 
=== modified file 'tests/fingerprint.txt.in'
--- tests/fingerprint.txt.in	2009-09-11 16:41:43 +0000
+++ tests/fingerprint.txt.in	2009-10-27 14:40:20 +0000
@@ -5,7 +5,7 @@
  from which test cases are run and a personal account that the tester \
  uses to verify the fingerprint reader
  .
- Fingerprint unlock verification procedure:
+ Fingerprint login verification procedure:
  1.- Click on the user switcher applet
  2.- Select your user name
  3.- A window should appear that provides the ability to login either \
@@ -23,9 +23,9 @@
  1.- Click on the user switcher applet
  2.- Select 'Lock screen'
  3.- Press any key or move the mouse
- 3.- A window should appear that provides the ability to unlock either \
+ 4.- A window should appear that provides the ability to unlock either \
  typing your password or using fingerprint authentication
- 4.- Use the fingerprint reader to unlock
- 5.- Screen should be unlocked
+ 5.- Use the fingerprint reader to unlock
+ 6.- Screen should be unlocked
  .
  Did the authentication procedure work correctly?
 
=== modified file 'tests/network.txt.in'
--- tests/network.txt.in	2009-09-11 16:41:43 +0000
+++ tests/network.txt.in	2009-10-27 14:40:20 +0000
@@ -25,14 +25,18 @@
 command: network_check
 _description:
  Built-in modem network connection procedure:
- 1.- Connect the telephone line to the computer
- 2.- Right click on the Network Manager applet
- 3.- Select 'Edit Connections'
- 4.- Select the 'DSL' tab
- 5.- Click on add 'Add' button
- 6.- Configure the connection parameters properly
- 7.- Notify OSD should confirm that the connection has been established
- 8.- Select Test to verify that it's possible to establish both http \
- and ftp connections
+ 1.- Open System -> Administration -> Network
+ 2.- Press Unlock and type your password to unlock the settings
+ 3.- Select the Connections tab.
+ 4.- Select Point to point connection and press Properties.
+ 5.- Tick Enable this connection
+ 6.- Choose Serial Modem from the Connection Type drop down.
+ 7.- Under Internet Service Provider data, enter the phone number and dial prefix.
+ 8.- Under Account Data enter your password and username.
+ 9.- Click the Modem tab.
+ 10.- Choose the modem settings you require.
+ 11.- Click OK.
+ 12.- Select the DNS tab and enter the DNS addresses of your ISP.
+ 13.- Click Close.
  .
- Was the connection correctly established?
+ Can you successfully establish a network connection?