The tests worked fine on faster build animals, right? And the clobber animals are much much slower.... So it seems perfectly sensible that their deadlock timeout would just have to be much much higher to have the same behaviour. I see nothing wrong in just setting deadlock timeout to a minute or more on these machines.
The invariant is just that the deadlock timeout needs enough head room over the actual time the tester's queries take. If they normally take a 1/10th of a second then why not just set the timeout to 10x however long they take on the clobber animals? -- Greg