Make way for a real make_request

The socket testing machinery had a make_request helper, but I want to
use that name for a test helper for test_request.