When a request got retried after a conflict error, a:

TypeError: getPublisherDeadlineValue() takes exactly 1 argument (0 given)

was raised.

Instead of adding a new test to cover this, run all tests from ZPublisher module (except a few which had suspicious errors).

This actual error happened when running ZPublisher.tests.testPublish.testPublisher before the fix.