1
0
Fork 0
mirror of https://github.com/zigzap/zap.git synced 2025-10-20 15:14:08 +00:00

http_auth test: http client code "fix"; also: 1 use 1 worker instead of 0 explicitly

This commit is contained in:
Rene Schallner 2023-12-31 00:16:36 +01:00
parent 715fe03edd
commit a8a8b537fe
7 changed files with 27 additions and 19 deletions

View file

@ -110,6 +110,6 @@ pub fn main() !void {
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
} }

View file

@ -115,6 +115,6 @@ pub fn main() !void {
defer thread.join(); defer thread.join();
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
} }

View file

@ -115,6 +115,6 @@ pub fn main() !void {
defer thread.join(); defer thread.join();
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
} }

View file

@ -44,6 +44,6 @@ pub fn main() !void {
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
} }

View file

@ -152,11 +152,19 @@ fn makeRequest(a: std.mem.Allocator, url: []const u8, auth: ?ClientAuthReqHeader
try req.send(.{}); try req.send(.{});
try req.wait(); try req.wait();
// var br = std.io.bufferedReaderSize(std.crypto.tls.max_ciphertext_record_len, req.reader()); // req.deinit() panics!
// var buffer: [1024]u8 = undefined; // defer req.deinit();
// we know we won't receive a lot
// const len = try br.reader().readAll(&buffer); // without this block, the tests sometimes get stuck which
// std.debug.print("RESPONSE:\n{s}\n", .{buffer[0..len]}); // might have to do with connection pooling and connections being in
// a different state when all data has been read?!?
{
var buffer: [1024]u8 = undefined;
// we know we won't receive a lot
const len = try req.reader().readAll(&buffer);
std.debug.print("RESPONSE:\n{s}\n", .{buffer[0..len]});
}
zap.fio_stop(); zap.fio_stop();
} }
@ -215,7 +223,7 @@ test "BearerAuthSingle authenticateRequest OK" {
// start worker threads // start worker threads
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
try std.testing.expectEqualStrings(HTTP_RESPONSE, received_response); try std.testing.expectEqualStrings(HTTP_RESPONSE, received_response);
@ -272,7 +280,7 @@ test "BearerAuthSingle authenticateRequest test-unauthorized" {
// start worker threads // start worker threads
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
try std.testing.expectEqualStrings("UNAUTHORIZED", received_response); try std.testing.expectEqualStrings("UNAUTHORIZED", received_response);
@ -323,7 +331,7 @@ test "BearerAuthMulti authenticateRequest OK" {
// start worker threads // start worker threads
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
try std.testing.expectEqualStrings(HTTP_RESPONSE, received_response); try std.testing.expectEqualStrings(HTTP_RESPONSE, received_response);
@ -374,7 +382,7 @@ test "BearerAuthMulti authenticateRequest test-unauthorized" {
// start worker threads // start worker threads
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
try std.testing.expectEqualStrings(HTTP_RESPONSE, received_response); try std.testing.expectEqualStrings(HTTP_RESPONSE, received_response);
@ -430,7 +438,7 @@ test "BasicAuth Token68 authenticateRequest" {
// start worker threads // start worker threads
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
try std.testing.expectEqualStrings(HTTP_RESPONSE, received_response); try std.testing.expectEqualStrings(HTTP_RESPONSE, received_response);
@ -486,7 +494,7 @@ test "BasicAuth Token68 authenticateRequest test-unauthorized" {
// start worker threads // start worker threads
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
try std.testing.expectEqualStrings("UNAUTHORIZED", received_response); try std.testing.expectEqualStrings("UNAUTHORIZED", received_response);
@ -552,7 +560,7 @@ test "BasicAuth UserPass authenticateRequest" {
// start worker threads // start worker threads
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
try std.testing.expectEqualStrings(HTTP_RESPONSE, received_response); try std.testing.expectEqualStrings(HTTP_RESPONSE, received_response);
@ -619,7 +627,7 @@ test "BasicAuth UserPass authenticateRequest test-unauthorized" {
// start worker threads // start worker threads
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
try std.testing.expectEqualStrings("UNAUTHORIZED", received_response); try std.testing.expectEqualStrings("UNAUTHORIZED", received_response);

View file

@ -71,7 +71,7 @@ test "http parameters" {
defer thread.join(); defer thread.join();
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
defer { defer {

View file

@ -52,7 +52,7 @@ test "send file" {
defer thread.join(); defer thread.join();
zap.start(.{ zap.start(.{
.threads = 1, .threads = 1,
.workers = 0, .workers = 1,
}); });
if (read_len) |rl| { if (read_len) |rl| {