make service_deadlock test more robust (again)