Rev 183: Merged test fixes. in http://bzr.daniel-watkins.co.uk/pqm/tag

[Daniel Watkins]

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

------------------------------------------------------------
revno: 183
revision-id: daniel at daniel-watkins.co.uk-20080722195126-qo6lrgng60le1n8q
parent: robertc at robertcollins.net-20080717100934-40fjde09nglggsub
parent: daniel at daniel-watkins.co.uk-20080718121005-7lggidjfd1h28cyu
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: tag
timestamp: Tue 2008-07-22 20:51:26 +0100
message:
  Merged test fixes.
modified:
  pqm/tests/test_pqm.py          x_Robert_Collins_<robert.collins at canonical.com>_Thu_Aug__4_22:52:41_2005_804.0
    ------------------------------------------------------------
    revno: 182.1.1
    revision-id: daniel at daniel-watkins.co.uk-20080718121005-7lggidjfd1h28cyu
    parent: robertc at robertcollins.net-20080717100934-40fjde09nglggsub
    committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
    branch nick: test-fixes
    timestamp: Fri 2008-07-18 13:10:05 +0100
    message:
      Fixed use of old imports in tests.
    modified:
      pqm/tests/test_pqm.py          x_Robert_Collins_<robert.collins at canonical.com>_Thu_Aug__4_22:52:41_2005_804.0
-------------- next part --------------
=== modified file 'pqm/tests/test_pqm.py'
--- a/pqm/tests/test_pqm.py	2008-07-17 10:09:34 +0000
+++ b/pqm/tests/test_pqm.py	2008-07-18 12:10:05 +0000
@@ -200,11 +200,11 @@
         self.assertEqual(script.getLines(),
             [("star-merge http://www.example.com/foo/bar "
               "http://www.example.com/bar/baz")])
-        self.assertEqual([pqm.MergeCommand(None,
-                                           None,
-                                           None,
-                                           'http://www.example.com/foo/bar',
-                                           'http://www.example.com/bar/baz')],
+        self.assertEqual([MergeCommand(None,
+                                       None,
+                                       None,
+                                       'http://www.example.com/foo/bar',
+                                       'http://www.example.com/bar/baz')],
                          script.getCommands())
 
     def testGPGFields(self):
@@ -229,11 +229,11 @@
             [("star-merge http://www.example.com/argh/blah "
               "http://www.example.com/bing/bong")])
         self.assertEqual(
-            [pqm.MergeCommand(None,
-                              None,
-                              None,
-                              'http://www.example.com/argh/blah',
-                              'http://www.example.com/bing/bong')],
+            [MergeCommand(None,
+                          None,
+                          None,
+                          'http://www.example.com/argh/blah',
+                          'http://www.example.com/bing/bong')],
             script.getCommands())
 
     def testDate(self):