# HG changeset patch # User wbell # Date 1271900794 0 # Node ID 39cb92420716dd2614c736bdf1a486a1a27413e1 # Parent 7f698d86732141efa357a0c1ca9404e1f5151e34 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. diff --git a/bitten/tests/master.py b/bitten/tests/master.py --- 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)