# HG changeset patch
# User wbell
# Date 1272123138 0
# Node ID 63d2d977ece64f367cc4b6e7aa6779452be6549b
# Parent  5f0cfee445409ae34c02154642b4f2b4f716d3f8
Bad merge of patch from [839]

diff --git a/bitten/tests/master.py b/bitten/tests/master.py
--- a/bitten/tests/master.py
+++ b/bitten/tests/master.py
@@ -272,7 +272,7 @@
 
         outheaders = {}
         outbody = StringIO()
-        
+
         req = Mock(method='GET', base_path='',
                    path_info='/builds/%d' % build.id,
                    href=Href('/trac'), remote_addr='127.0.0.1', args={},
@@ -525,8 +525,8 @@
                          reports[0].generator)
         self.assertEqual(1, len(reports[0].items))
         self.assertEqual({
-            'fixture': 'my.Fixture', 
-            'file': 'my/test/file.py', 
+            'fixture': 'my.Fixture',
+            'file': 'my/test/file.py',
             'stdout': 'Doing my thing',
             'type': 'test',
         }, reports[0].items[0])
@@ -597,7 +597,7 @@
         from trac.attachment import Attachment
         config_attachments = list(Attachment.select(self.env, 'build', 'test'))
         build_attachments = list(Attachment.select(self.env, 'build', 'test/1'))
-        
+
         self.assertEquals(1, len(build_attachments))
         self.assertEquals('hal', build_attachments[0].author)
         self.assertEquals('bar bar', build_attachments[0].description)
@@ -712,12 +712,14 @@
         steps = list(BuildStep.select(self.env, build.id))
         self.assertEqual(2, len(steps))
 
-        # invalidate the build. 
+        # invalidate the build.
 
         build = Build.fetch(self.env, build.id)
         build.slave = None
         build.status = Build.PENDING
         build.slave_info = {}
+        for step in list(BuildStep.select(self.env, build=build.id)):
+            step.delete()
         build.update()
 
         # have this slave submit more data.
@@ -889,6 +891,9 @@
                    write=outbody.write,
                    incookie=Cookie('trac_auth=123'))
         module = BuildMaster(self.env)
+
+        module._start_new_step(build, 'foo').insert()
+
         assert module.match_request(req)
 
         self.assertRaises(RequestDone, module.process_request, req)
@@ -967,7 +972,7 @@
         module._start_new_step(build, 'foo').insert()
 
         assert module.match_request(req)
-        
+
         self.assertRaises(RequestDone, module.process_request, req)
 
         self.assertEqual(405, outheaders['Status'])