SoupCache *cache;
char *cache_dir;
char *body1, *body2;
+ guint flags;
debug_printf (1, "Cache cancel tests\n");
/* Check that messages are correctly processed on cancellations. */
debug_printf (1, " Cancel fresh resource with soup_session_message_cancel()\n");
- do_request_with_cancel (session, base_uri, "GET", "/1", SOUP_TEST_REQUEST_CANCEL_MESSAGE);
+ flags = SOUP_TEST_REQUEST_CANCEL_MESSAGE | SOUP_TEST_REQUEST_CANCEL_IMMEDIATE;
+ do_request_with_cancel (session, base_uri, "GET", "/1", flags);
if (cancelled_requests != 1) {
debug_printf (1, " invalid number of cancelled requests: %d (1 expected)\n",
cancelled_requests);
}
debug_printf (1, " Cancel fresh resource with g_cancellable_cancel()\n");
- do_request_with_cancel (session, base_uri, "GET", "/1", SOUP_TEST_REQUEST_CANCEL_CANCELLABLE);
+ flags = SOUP_TEST_REQUEST_CANCEL_CANCELLABLE | SOUP_TEST_REQUEST_CANCEL_IMMEDIATE;
+ do_request_with_cancel (session, base_uri, "GET", "/1", flags);
if (cancelled_requests != 1) {
debug_printf (1, " invalid number of cancelled requests: %d (1 expected)\n",
cancelled_requests);
/* Check that messages are correctly processed on cancellations. */
debug_printf (1, " Cancel a revalidating resource with soup_session_message_cancel()\n");
- do_request_with_cancel (session, base_uri, "GET", "/2", SOUP_TEST_REQUEST_CANCEL_MESSAGE);
+ flags = SOUP_TEST_REQUEST_CANCEL_MESSAGE | SOUP_TEST_REQUEST_CANCEL_IMMEDIATE;
+ do_request_with_cancel (session, base_uri, "GET", "/2", flags);
if (cancelled_requests != 2) {
debug_printf (1, " invalid number of cancelled requests: %d (2 expected)\n",
cancelled_requests);
}
debug_printf (1, " Cancel a revalidating resource with g_cancellable_cancel()\n");
- do_request_with_cancel (session, base_uri, "GET", "/2", SOUP_TEST_REQUEST_CANCEL_CANCELLABLE);
+ flags = SOUP_TEST_REQUEST_CANCEL_CANCELLABLE | SOUP_TEST_REQUEST_CANCEL_IMMEDIATE;
+ do_request_with_cancel (session, base_uri, "GET", "/2", flags);
if (cancelled_requests != 2) {
debug_printf (1, " invalid number of cancelled requests: %d (2 expected)\n",
cancelled_requests);
SOUP_TEST_REQUEST_NONE = 0,
SOUP_TEST_REQUEST_CANCEL_MESSAGE = (1 << 0),
SOUP_TEST_REQUEST_CANCEL_CANCELLABLE = (1 << 1),
- SOUP_TEST_REQUEST_CANCEL_SOON = (1 << 2)
+ SOUP_TEST_REQUEST_CANCEL_SOON = (1 << 2),
+ SOUP_TEST_REQUEST_CANCEL_IMMEDIATE = (1 << 3)
} SoupTestRequestFlags;
SoupSession *soup_test_session_new (GType type, ...);