Rev 179: Moved QueueSetup to pqm.tests.QueueSetup. in http://bzr.daniel-watkins.co.uk/pqm/empty-queue

[Daniel Watkins]

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

------------------------------------------------------------
revno: 179
revision-id: daniel at daniel-watkins.co.uk-20080710161953-ohx24ca1c88s9m0j
parent: daniel at daniel-watkins.co.uk-20080710160216-hazgu51bbkw9fums
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: TestCaseWithQueue
timestamp: Thu 2008-07-10 17:19:53 +0100
message:
  Moved QueueSetup to pqm.tests.QueueSetup.
-------------- next part --------------
=== modified file 'pqm/tests/__init__.py'
--- a/pqm/tests/__init__.py	2006-01-11 03:58:41 +0000
+++ b/pqm/tests/__init__.py	2008-07-10 16:19:53 +0000
@@ -0,0 +1,75 @@
+import os
+import shutil
+from textwrap import dedent
+
+
+sample_message = dedent("""\
+    From: John.Citizen at example.com
+    Subject: A new action
+    star-merge archive at example.com/foo--bar--0 archive2 at example.com/bar--foo--1
+    """)
+
+sample_message_2 = dedent("""\
+    From: John.Citizen at example.com
+    Subject: A new action
+    star-merge archive at example.com/foo--bar--0 archive2 at example.com/bar--foo--2
+    """)
+
+sample_message_bad = dedent("""\
+    From: John.Citizen at example.com
+    Subject: A new action
+    star-merge archive at example.com/foo--bar--0  unregistered at example.com/bar--foo--1
+    """)
+
+
+class QueueSetup(object):
+    """Setup a queue with mock messages in it."""
+
+    def __init__(self, processing=True, empty=False):
+        self.configFileName = "Foo"
+        self.cwd = os.path.abspath(os.path.curdir)
+        self.processing = processing
+        self.empty = empty
+        if not empty:
+            self.message = sample_message
+            self.message_bad = sample_message_bad
+            self.message3 = sample_message_2
+
+    def setUp(self):
+        myFile=open(self.configFileName, "w")
+        myFile.write(dedent("""\
+            [DEFAULT]
+            queuedir=%s/queue
+            [archive2 at example.com/bar--foo--1]
+            project=project
+            [archive2 at example.com/bar--foo--2]
+            """ % self.cwd))
+        myFile.close()
+        self.queuedir = os.path.join(self.cwd, "queue")
+        try:
+            os.mkdir(self.queuedir)
+            os.mkdir(self.queuedir + '/pqm')
+        except OSError:
+            pass
+        if not self.processing:
+            open("%s/stop.patch" % (self.queuedir,), "w").close()
+        if not self.empty:
+            self.messageFileName = os.path.join(self.queuedir,
+                                                "patch.00000001")
+            messageFile = open(self.messageFileName, "w")
+            messageFile.write(self.message)
+            messageFile.close()
+            self.messageFileNameBad = os.path.join(self.queuedir,
+                                                   "patch.00000002")
+            messageFile = open(self.messageFileNameBad, "w")
+            messageFile.write(self.message_bad)
+            messageFile.close()
+            self.messageFileName3 = os.path.join(self.queuedir,
+                                                 "patch.00000003")
+            messageFile = open(self.messageFileName3, "w")
+            messageFile.write(self.message3)
+            messageFile.close()
+
+    def tearDown(self):
+        os.unlink(self.configFileName)
+        shutil.rmtree(self.queuedir, ignore_errors=True)

=== modified file 'pqm/tests/test_pqm.py'
--- a/pqm/tests/test_pqm.py	2008-07-10 16:02:16 +0000
+++ b/pqm/tests/test_pqm.py	2008-07-10 16:19:53 +0000
@@ -12,24 +12,11 @@
 from twisted.trial import unittest
 
 import pqm
-
-sample_message = dedent("""\
-    From: John.Citizen at example.com
-    Subject: A new action
-    star-merge archive at example.com/foo--bar--0 archive2 at example.com/bar--foo--1
-    """)
-
-sample_message_2 = dedent("""\
-    From: John.Citizen at example.com
-    Subject: A new action
-    star-merge archive at example.com/foo--bar--0 archive2 at example.com/bar--foo--2
-    """)
-
-sample_message_bad = dedent("""\
-    From: John.Citizen at example.com
-    Subject: A new action
-    star-merge archive at example.com/foo--bar--0  unregistered at example.com/bar--foo--1
-    """)
+from pqm.tests import (QueueSetup,
+                       sample_message,
+                       sample_message_2,
+                       sample_message_bad,
+                      )
 
 sample_signed_message = dedent("""\
     From: whee at bar.com (Matthew Thomas)
@@ -118,59 +105,6 @@
     """)
 
 
-class QueueSetup(object):
-    """Setup a queue with mock messages in it."""
-
-    def __init__(self, processing=True, empty=False):
-        self.configFileName = "Foo"
-        self.cwd = os.path.abspath(os.path.curdir)
-        self.processing = processing
-        self.empty = empty
-        if not empty:
-            self.message = sample_message
-            self.message_bad = sample_message_bad
-            self.message3 = sample_message_2
-
-    def setUp(self):
-        myFile=open(self.configFileName, "w")
-        myFile.write(dedent("""\
-            [DEFAULT]
-            queuedir=%s/queue
-            [archive2 at example.com/bar--foo--1]
-            project=project
-            [archive2 at example.com/bar--foo--2]
-            """ % self.cwd))
-        myFile.close()
-        self.queuedir = os.path.join(self.cwd, "queue")
-        try:
-            os.mkdir(self.queuedir)
-            os.mkdir(self.queuedir + '/pqm')
-        except OSError:
-            pass
-        if not self.processing:
-            open("%s/stop.patch" % (self.queuedir,), "w").close()
-        if not self.empty:
-            self.messageFileName = os.path.join(self.queuedir,
-                                                "patch.00000001")
-            messageFile = open(self.messageFileName, "w")
-            messageFile.write(self.message)
-            messageFile.close()
-            self.messageFileNameBad = os.path.join(self.queuedir,
-                                                   "patch.00000002")
-            messageFile = open(self.messageFileNameBad, "w")
-            messageFile.write(self.message_bad)
-            messageFile.close()
-            self.messageFileName3 = os.path.join(self.queuedir,
-                                                 "patch.00000003")
-            messageFile = open(self.messageFileName3, "w")
-            messageFile.write(self.message3)
-            messageFile.close()
-
-    def tearDown(self):
-        os.unlink(self.configFileName)
-        shutil.rmtree(self.queuedir, ignore_errors=True)
-
-
 class TestWithQueueDirectory(unittest.TestCase):
 
     def setUp(self):