changeset 747:39cb92420716

Removing unnecessary IN_PROGRESS check on slave step submission. We haven't needed this check since the introduction of the slave_token, and the actual error message could never be seen, other than in a test, which didn't clean up state from the build properly.
author wbell
date Thu, 22 Apr 2010 01:46:34 +0000
parents 7f698d867321
children ec805e982b4c
files bitten/tests/master.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/bitten/tests/master.py
+++ b/bitten/tests/master.py
@@ -699,6 +699,7 @@
         build = Build.fetch(self.env, build.id)
         build.slave = None
         build.status = Build.PENDING
+        build.slave_info = {}
         build.update()
 
         # have this slave submit more data.
@@ -727,8 +728,8 @@
         self.assertRaises(RequestDone, module.process_request, req)
 
         self.assertEquals(409, outheaders['Status'])
-        self.assertEquals('Build 1 has been invalidated for host 127.0.0.1.',
-                        outbody.getvalue())            
+        self.assertEquals('Token mismatch (wrong slave): slave=123, build=',
+                          outbody.getvalue())
 
         build = Build.fetch(self.env, build.id)
         self.assertEqual(Build.PENDING, build.status)
Copyright (C) 2012-2017 Edgewall Software