Merge "Raise AssertionError instead of eventlet.timeout.Timeout when failing."