Rev 225: Modified format of error messages slightly. in http://bzr.daniel-watkins.co.uk/pqm/xmlrpc

[Daniel Watkins]

At http://bzr.daniel-watkins.co.uk/pqm/xmlrpc

------------------------------------------------------------
revno: 225
revision-id: daniel at daniel-watkins.co.uk-20080801033252-pirqlqrwlr4c5jff
parent: daniel at daniel-watkins.co.uk-20080801031934-3jnzxqt7to2wkxte
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: xmlrpc-validation
timestamp: Fri 2008-08-01 04:32:52 +0100
message:
  Modified format of error messages slightly.
-------------- next part --------------
=== modified file 'pqm/ui/tests/test_xmlrpc.py'
--- a/pqm/ui/tests/test_xmlrpc.py	2008-08-01 03:19:34 +0000
+++ b/pqm/ui/tests/test_xmlrpc.py	2008-08-01 03:32:52 +0000
@@ -51,8 +51,8 @@
     def test_invalid_submission(self):
         xmlrpc = self.get_xmlrpc()
         out = xmlrpc.xmlrpc_submit(sample_message_bad)
-        self.assertEqual('Sender not authorised to commit to branch'
-                         ' http://www.example.com/foo/unregistered',
+        self.assertEqual("Error: 'Sender not authorised to commit to branch"
+                         " http://www.example.com/foo/unregistered'",
                          out)
         queuedir = xmlrpc.pqminfo.queuedir
         patches = [f for f in os.listdir(queuedir) if f.startswith('patch.')]
@@ -63,8 +63,8 @@
         msg = (sample_message_template %
                 ('star-merge baz http://www.example.com/foo/unregistered',))
         out = xmlrpc.xmlrpc_submit(msg)
-        self.assertEqual('Sender not authorised to commit to branch'
-                         ' http://www.example.com/foo/unregistered',
+        self.assertEqual("Error: 'Sender not authorised to commit to branch"
+                         " http://www.example.com/foo/unregistered'",
                          out)
         queuedir = xmlrpc.pqminfo.queuedir
         patches = [f for f in os.listdir(queuedir) if f.startswith('patch.')]
@@ -75,7 +75,7 @@
         msg = (sample_message_template %
                 ('star-merge fluff baz',))
         out = xmlrpc.xmlrpc_submit(msg)
-        self.assertEqual('fluff is not a valid source branch.', out)
+        self.assertEqual("Error: 'fluff is not a branch'", out)
         queuedir = xmlrpc.pqminfo.queuedir
         patches = [f for f in os.listdir(queuedir) if f.startswith('patch.')]
         self.assertEqual(0, len(patches))

=== modified file 'pqm/ui/xmlrpc.py'
--- a/pqm/ui/xmlrpc.py	2008-08-01 02:53:04 +0000
+++ b/pqm/ui/xmlrpc.py	2008-08-01 03:32:52 +0000
@@ -67,7 +67,7 @@
             try:
                 self.validate(email_string)
             except PQMCmdFailure, e:
-                return '\n'.join(e.output)
+                raise PQMException(None, '\n'.join(e.output))
             # Write script
             pqm.write_script(queuedir, email_string)
             return "Success!"