Merge lp:~daniel-thewatkins/pqm/rename-test-strings into lp:pqm

[Dan Watkins]

[Dan Watkins (daniel-thewatkins)]

=== modified file 'pqm/tests/test_pqm.py'
--- pqm/tests/test_pqm.py 2007-05-21 01:08:46 +0000
+++ pqm/tests/test_pqm.py 2008-07-03 00:37:57 +0000
@@ -1,31 +1,33 @@
-
-from twisted.trial import unittest
-import config_manager
+import logging
 import os
-import logging
 import shutil
 from StringIO import StringIO

+from bzrlib.tests import TestCaseWithTransport
+import config_manager
+from twisted.trial import unittest
+
 import pqm

 sample_message = ("From: <email address hidden>\n"
                   "Subject: A new action\n"
- "star-merge <email address hidden>/foo--bar--0 "
- "<email address hidden>/bar--foo--1")
+ "star-merge http://www.example.com/foo/bar "
+ "http://www.example.com/bar/baz")
 sample_message_2 = ("From: <email address hidden>\n"
                     "Subject: A new action\n"
- "star-merge <email address hidden>/foo--bar--0 "
- "<email address hidden>/bar--foo--2")
+ "star-merge http://www.example.com/qux/thud "
+ "http://www.example.com/fred/waldo")
 sample_message_bad = ("From: <email address hidden>\n"
                       "Subject: A new action\n"
- "star-merge <email address hidden>/foo--bar--0 "
- "<email address hidden>/bar--foo--1")
+ "star-merge http://www.example.com/foo/bar "
+ "http://www.example.com/foo/unregistered")
 sample_signed_message = ("From: <email address hidden> (Matthew Thomas)\n"
     "Subject: [trivial] fix various actions portlet icons\n"
     "-----BEGIN PGP SIGNED MESSAGE-----\n"
     "Hash: SHA1\n"
     "\n"
- "star-merge <email address hidden>/launchpad--devel--0 <email address hidden>/launchpad--devel--0\n"
+ "star-merge http://www.example.com/argh/blah "
+ "http://www.example.com/bing/bong\n"
     "-----BEGIN PGP SIGNATURE-----\n"
     "Version: GnuPG v1.2.5 (GNU/Linux)\n"
     "\n"
@@ -69,11 +71,11 @@

 sample_config_unpublished = ("[DEFAULT]\n"
                              "queuedir=/tmp\n"
- "[foo@bar/gam--foo--0]\n")
+ "[http://www.example.com/bar/baz]\n")

 sample_config_published = ("[DEFAULT]\n"
                            "queuedir=/tmp\n"
- "[foo@bar/gam--foo--0]\n"
+ "[http://www.example.com/bar/baz]\n"
                            "published_at=file:///a\n"
                            "[file:///tmp/foo]\n"
                            "published_at=file:///b\n"
@@ -109,9 +111,9 @@
         myFile=open(self.configFileName, "w")
         myFile.write("[DEFAULT]\n"
                      "queuedir=%s/queue\n"
- "[<email address hidden>/bar--foo--1]\n"
+ "[http://www.example.com/bar/baz]\n"
                      "project=project\n"
- "[<email address hidden>/bar--foo--2]\n"
+ "[http://www.example.com/fred/waldo]\n"
                      % self.cwd)
         myFile.close()
         self.queuedir = os.path.join(self.cwd, "queue")
@@ -174,16 +176,17 @@
         self.assertEqual(script...

[Robert Collins (lifeless)]

currently conflicts

[lp:~daniel-thewatkins/pqm/rename-test-strings]

182. By Dan Watkins on 2008-07-16

Merged pqm.dev. There were epic conflicts.

Unmerged revisions