Rev 216: Updated test_valid_submission to pass, using new 'baz' directory. in http://bzr.daniel-watkins.co.uk/pqm/xmlrpc

[Daniel Watkins]

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

------------------------------------------------------------
revno: 216
revision-id: daniel at daniel-watkins.co.uk-20080801024532-cq9bihh3iwzn9u69
parent: daniel at daniel-watkins.co.uk-20080801024501-rtctq80w1jsob7co
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: xmlrpc-validation
timestamp: Fri 2008-08-01 03:45:32 +0100
message:
  Updated test_valid_submission to pass, using new 'baz' directory.
-------------- next part --------------
=== modified file 'pqm/ui/tests/test_xmlrpc.py'
--- a/pqm/ui/tests/test_xmlrpc.py	2008-08-01 02:10:25 +0000
+++ b/pqm/ui/tests/test_xmlrpc.py	2008-08-01 02:45:32 +0000
@@ -18,7 +18,9 @@
 import os
 
 from pqm.errors import PQMCmdFailure
-from pqm.tests import sample_message, sample_message_bad, TestCaseWithQueue
+from pqm.tests import (sample_message_bad,
+                       sample_message_template,
+                       TestCaseWithQueue)
 from pqm.ui.twistd import PQMInfo
 from pqm.ui.xmlrpc import PQM_XMLRPC
 
@@ -37,13 +39,14 @@
 
     def test_valid_submission(self):
         xmlrpc = self.get_xmlrpc()
-        out = xmlrpc.xmlrpc_submit(sample_message)
+        msg = (sample_message_template %
+                ('star-merge baz http://www.example.com/bar/baz',))
+        out = xmlrpc.xmlrpc_submit(msg)
         self.assertEqual('Success!', out)
         queuedir = xmlrpc.pqminfo.queuedir
         patches = [f for f in os.listdir(queuedir) if f.startswith('patch.')]
         self.assertEqual(1, len(patches)) # We should have only one patch
-        self.assertFileEqual(sample_message,
-                             os.path.join(queuedir, patches[0]))
+        self.assertFileEqual(msg, os.path.join(queuedir, patches[0]))
 
     def test_invalid_submission(self):
         xmlrpc = self.get_xmlrpc()