Rev 182: Converted TestWithQueueDirectory to subclass TestCaseWithQueue. in http://bzr.daniel-watkins.co.uk/pqm/empty-queue

[Daniel Watkins]

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

------------------------------------------------------------
revno: 182
revision-id: daniel at daniel-watkins.co.uk-20080710164201-zmw1dgimft79nd1f
parent: daniel at daniel-watkins.co.uk-20080710163552-maaev5jnyg7iyp3h
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: TestCaseWithQueue
timestamp: Thu 2008-07-10 17:42:01 +0100
message:
  Converted TestWithQueueDirectory to subclass TestCaseWithQueue.
-------------- next part --------------
=== modified file 'pqm/tests/test_pqm.py'
--- a/pqm/tests/test_pqm.py	2008-07-10 16:35:52 +0000
+++ b/pqm/tests/test_pqm.py	2008-07-10 16:42:01 +0000
@@ -13,6 +13,7 @@
                        sample_message,
                        sample_message_2,
                        sample_message_bad,
+                       TestCaseWithQueue,
                       )
 
 sample_signed_message = dedent("""\
@@ -102,21 +103,13 @@
     """)
 
 
-class TestWithQueueDirectory(unittest.TestCase):
-
-    def setUp(self):
-        unittest.TestCase.setUp(self)
-        self.queue = QueueSetup()
-        self.queue.setUp()
+class TestWithQueueDirectory(TestCaseWithQueue):
 
     def testName(self):
         patch = pqm.Script('foo.script', logging, False, 0, None, None)
         self.assertEqual(patch.filename, 'foo.script')
 
-    def tearDown(self):
-        self.queue.tearDown()
-
-    def getScript(self, content):
+    def getScript(self, queue, content):
         """Get a script for testing with."""
         scriptname = 'foo.script'
         scriptFile = open(scriptname, "w")
@@ -127,12 +120,13 @@
         self.addCleanup(cleanupScript)
         pqm.pqm_subdir = os.path.abspath('queue/pqm')
         configp = pqm.ConfigParser()
-        configp.read([self.queue.configFileName])
+        configp.read([queue.configFileName])
         handler = pqm.BranchSpecOptionHandler(configp)
         return pqm.Script(scriptname, logging, False, 54, handler, configp)
 
     def testFields(self):
-        script = self.getScript(sample_message)
+        queue = self.getQueue()
+        script = self.getScript(queue, sample_message)
         self.assertEqual(script.getSender(), "John.Citizen at example.com")
         self.assertEqual(script.getSubject(), "A new action")
         self.assertEqual(script.getContent(),
@@ -149,7 +143,8 @@
                          script.getCommands())
 
     def testGPGFields(self):
-        script = self.getScript(sample_signed_message)
+        queue = self.getQueue()
+        script = self.getScript(queue, sample_signed_message)
         self.assertEqual(script.getSender(), "whee at bar.com (Matthew Thomas)")
         self.assertEqual(script.getSubject(),
             "[trivial] fix various actions portlet icons")
@@ -179,27 +174,30 @@
 
     def testDate(self):
         """Can we access a submission time for scripts."""
-        script = self.getScript(sample_message)
+        queue = self.getQueue()
+        script = self.getScript(queue, sample_message)
         self.assertEqual(script.getSubmissionTime(), 54)
 
     def testProjects(self):
         # A script may affect multiple branches, so we can ask the script
         # for its projects, and then for the commands for a project.
-        script = self.getScript(sample_message)
+        queue = self.getQueue()
+        script = self.getScript(queue, sample_message)
         self.assertEqual(set(['project']), script.getProjects())
 
     def test_log_status(self):
         # make an initial status file
-        status = file(self.queue.queuedir + '/pqm/status', 'wt')
+        queue = self.getQueue()
+        status = file(queue.queuedir + '/pqm/status', 'wt')
         status.write('bar\n')
         status.close()
-        script = self.getScript(sample_message)
+        script = self.getScript(queue, sample_message)
         command = pqm.Command(script,
                               script._branch_spec_handler,
                               script._configp)
         logger = MockLogger()
         command.log_with_status(logger, 'foo')
-        content = file(self.queue.queuedir + '/pqm/status').read()
+        content = file(queue.queuedir + '/pqm/status').read()
         self.assertEqual('bar\nfoo\n', content)