Rev 184: Converted TestTwistedUI 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: 184
revision-id: daniel at daniel-watkins.co.uk-20080710164650-dd3c037m6wah8yuq
parent: daniel at daniel-watkins.co.uk-20080710164337-y4962o5sczz0tqv7
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: TestCaseWithQueue
timestamp: Thu 2008-07-10 17:46:50 +0100
message:
  Converted TestTwistedUI to subclass TestCaseWithQueue.
-------------- next part --------------
=== modified file 'pqm/ui/tests/test_twisted.py'
--- a/pqm/ui/tests/test_twisted.py	2008-07-10 16:43:37 +0000
+++ b/pqm/ui/tests/test_twisted.py	2008-07-10 16:46:50 +0000
@@ -1,4 +1,3 @@
-
 from twisted.trial import unittest
 from twisted.web.resource import getChildForRequest
 from twisted.web.test.test_web import DummyRequest
@@ -7,30 +6,23 @@
 import logging
 
 import pqm
-from pqm.tests import QueueSetup
-
-class TestTwistedUI(unittest.TestCase):
+from pqm.tests import TestCaseWithQueue
+
+
+class TestTwistedUI(TestCaseWithQueue):
 
     def testImports(self):
         import pqm.ui.twistd
 
-    def setUp(self):
-        unittest.TestCase.setUp(self)
-        self.queueSetup = QueueSetup()
-        self.queueSetup.setUp()
-
-    def tearDown(self):
-        unittest.TestCase.tearDown(self)
-        self.queueSetup.tearDown()
-
     def testQueue(self):
+        queue = self.getQueue()
         configp = pqm.ConfigParser()
-        configp.read([self.queueSetup.configFileName])
+        configp.read([queue.configFileName])
         handler = pqm.BranchSpecOptionHandler(configp)
         queuedir = pqm.get_queuedir(configp, logging, [])
         patches = pqm.find_patches(queuedir, logging, None, handler, configp)
         self.assertEqual(3, len(patches))
-        self.assertEqual(patches[0].filename, self.queueSetup.messageFileName)
+        self.assertEqual(patches[0].filename, queue.messageFileName)
         self.assertEqual(set(['project']),
                          patches[0].getCommands()[0].getProjects())
         self.assertRaises(KeyError,
@@ -40,10 +32,11 @@
 
     def getResource(self):
         from pqm.ui.twistd import PQMInfo, QueueResource
-        statusfile = file(self.queueSetup.queuedir + '/pqm/status', 'wt')
+        queue = self.getQueue()
+        statusfile = file(queue.queuedir + '/pqm/status', 'wt')
         statusfile.write("<foo\nbar\nbaz\nquux\ntheta\n")
         statusfile.close()
-        pqminfo = PQMInfo([self.queueSetup.configFileName])
+        pqminfo = PQMInfo([queue.configFileName])
         resource = QueueResource(pqminfo)
         pqminfo.refresh()
         return resource