authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-06-27 15:38:40-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-06-27 15:38:40-04:00
logd422d5753b64b57b8559ceee45081f4e1e355e54
tree5cd5812badbdfc21a8e30510804cdaf3c37d38ae
parent8a251c411dd9347082d315b197a862ba3cfa06ba
signaturelock-open Commit is signed but in an unrecognized format.

avoid std.debug.global_allocator in http headers tests

2 files changed, 28 insertions(+), 22 deletions(-)

std/event/lock.zig+2
...@@ -123,6 +123,8 @@ pub const Lock = struct {...@@ -123,6 +123,8 @@ pub const Lock = struct {
123};123};
124124
125test "std.event.Lock" {125test "std.event.Lock" {
126 // TODO https://github.com/ziglang/zig/issues/2377
127 if (true) return error.SkipZigTest;
126 if (builtin.single_threaded) return error.SkipZigTest;128 if (builtin.single_threaded) return error.SkipZigTest;
127129
128 const allocator = std.heap.direct_allocator;130 const allocator = std.heap.direct_allocator;
std/http/headers.zig+26-22
...@@ -83,8 +83,12 @@ const HeaderEntry = struct {...@@ -83,8 +83,12 @@ const HeaderEntry = struct {
83 }83 }
84};84};
8585
86var test_memory: [32 * 1024]u8 = undefined;
87var test_fba_state = std.heap.FixedBufferAllocator.init(&test_memory);
88const test_allocator = &test_fba_state.allocator;
89
86test "HeaderEntry" {90test "HeaderEntry" {
87 var e = try HeaderEntry.init(debug.global_allocator, "foo", "bar", null);91 var e = try HeaderEntry.init(test_allocator, "foo", "bar", null);
88 defer e.deinit();92 defer e.deinit();
89 testing.expectEqualSlices(u8, "foo", e.name);93 testing.expectEqualSlices(u8, "foo", e.name);
90 testing.expectEqualSlices(u8, "bar", e.value);94 testing.expectEqualSlices(u8, "bar", e.value);
...@@ -376,7 +380,7 @@ pub const Headers = struct {...@@ -376,7 +380,7 @@ pub const Headers = struct {
376};380};
377381
378test "Headers.iterator" {382test "Headers.iterator" {
379 var h = Headers.init(debug.global_allocator);383 var h = Headers.init(test_allocator);
380 defer h.deinit();384 defer h.deinit();
381 try h.append("foo", "bar", null);385 try h.append("foo", "bar", null);
382 try h.append("cookie", "somevalue", null);386 try h.append("cookie", "somevalue", null);
...@@ -399,7 +403,7 @@ test "Headers.iterator" {...@@ -399,7 +403,7 @@ test "Headers.iterator" {
399}403}
400404
401test "Headers.contains" {405test "Headers.contains" {
402 var h = Headers.init(debug.global_allocator);406 var h = Headers.init(test_allocator);
403 defer h.deinit();407 defer h.deinit();
404 try h.append("foo", "bar", null);408 try h.append("foo", "bar", null);
405 try h.append("cookie", "somevalue", null);409 try h.append("cookie", "somevalue", null);
...@@ -409,7 +413,7 @@ test "Headers.contains" {...@@ -409,7 +413,7 @@ test "Headers.contains" {
409}413}
410414
411test "Headers.delete" {415test "Headers.delete" {
412 var h = Headers.init(debug.global_allocator);416 var h = Headers.init(test_allocator);
413 defer h.deinit();417 defer h.deinit();
414 try h.append("foo", "bar", null);418 try h.append("foo", "bar", null);
415 try h.append("baz", "qux", null);419 try h.append("baz", "qux", null);
...@@ -437,7 +441,7 @@ test "Headers.delete" {...@@ -437,7 +441,7 @@ test "Headers.delete" {
437}441}
438442
439test "Headers.orderedRemove" {443test "Headers.orderedRemove" {
440 var h = Headers.init(debug.global_allocator);444 var h = Headers.init(test_allocator);
441 defer h.deinit();445 defer h.deinit();
442 try h.append("foo", "bar", null);446 try h.append("foo", "bar", null);
443 try h.append("baz", "qux", null);447 try h.append("baz", "qux", null);
...@@ -460,7 +464,7 @@ test "Headers.orderedRemove" {...@@ -460,7 +464,7 @@ test "Headers.orderedRemove" {
460}464}
461465
462test "Headers.swapRemove" {466test "Headers.swapRemove" {
463 var h = Headers.init(debug.global_allocator);467 var h = Headers.init(test_allocator);
464 defer h.deinit();468 defer h.deinit();
465 try h.append("foo", "bar", null);469 try h.append("foo", "bar", null);
466 try h.append("baz", "qux", null);470 try h.append("baz", "qux", null);
...@@ -483,7 +487,7 @@ test "Headers.swapRemove" {...@@ -483,7 +487,7 @@ test "Headers.swapRemove" {
483}487}
484488
485test "Headers.at" {489test "Headers.at" {
486 var h = Headers.init(debug.global_allocator);490 var h = Headers.init(test_allocator);
487 defer h.deinit();491 defer h.deinit();
488 try h.append("foo", "bar", null);492 try h.append("foo", "bar", null);
489 try h.append("cookie", "somevalue", null);493 try h.append("cookie", "somevalue", null);
...@@ -503,7 +507,7 @@ test "Headers.at" {...@@ -503,7 +507,7 @@ test "Headers.at" {
503}507}
504508
505test "Headers.getIndices" {509test "Headers.getIndices" {
506 var h = Headers.init(debug.global_allocator);510 var h = Headers.init(test_allocator);
507 defer h.deinit();511 defer h.deinit();
508 try h.append("foo", "bar", null);512 try h.append("foo", "bar", null);
509 try h.append("set-cookie", "x=1", null);513 try h.append("set-cookie", "x=1", null);
...@@ -515,27 +519,27 @@ test "Headers.getIndices" {...@@ -515,27 +519,27 @@ test "Headers.getIndices" {
515}519}
516520
517test "Headers.get" {521test "Headers.get" {
518 var h = Headers.init(debug.global_allocator);522 var h = Headers.init(test_allocator);
519 defer h.deinit();523 defer h.deinit();
520 try h.append("foo", "bar", null);524 try h.append("foo", "bar", null);
521 try h.append("set-cookie", "x=1", null);525 try h.append("set-cookie", "x=1", null);
522 try h.append("set-cookie", "y=2", null);526 try h.append("set-cookie", "y=2", null);
523527
524 {528 {
525 const v = try h.get(debug.global_allocator, "not-present");529 const v = try h.get(test_allocator, "not-present");
526 testing.expect(null == v);530 testing.expect(null == v);
527 }531 }
528 {532 {
529 const v = (try h.get(debug.global_allocator, "foo")).?;533 const v = (try h.get(test_allocator, "foo")).?;
530 defer debug.global_allocator.free(v);534 defer test_allocator.free(v);
531 const e = v[0];535 const e = v[0];
532 testing.expectEqualSlices(u8, "foo", e.name);536 testing.expectEqualSlices(u8, "foo", e.name);
533 testing.expectEqualSlices(u8, "bar", e.value);537 testing.expectEqualSlices(u8, "bar", e.value);
534 testing.expectEqual(false, e.never_index);538 testing.expectEqual(false, e.never_index);
535 }539 }
536 {540 {
537 const v = (try h.get(debug.global_allocator, "set-cookie")).?;541 const v = (try h.get(test_allocator, "set-cookie")).?;
538 defer debug.global_allocator.free(v);542 defer test_allocator.free(v);
539 {543 {
540 const e = v[0];544 const e = v[0];
541 testing.expectEqualSlices(u8, "set-cookie", e.name);545 testing.expectEqualSlices(u8, "set-cookie", e.name);
...@@ -552,30 +556,30 @@ test "Headers.get" {...@@ -552,30 +556,30 @@ test "Headers.get" {
552}556}
553557
554test "Headers.getCommaSeparated" {558test "Headers.getCommaSeparated" {
555 var h = Headers.init(debug.global_allocator);559 var h = Headers.init(test_allocator);
556 defer h.deinit();560 defer h.deinit();
557 try h.append("foo", "bar", null);561 try h.append("foo", "bar", null);
558 try h.append("set-cookie", "x=1", null);562 try h.append("set-cookie", "x=1", null);
559 try h.append("set-cookie", "y=2", null);563 try h.append("set-cookie", "y=2", null);
560564
561 {565 {
562 const v = try h.getCommaSeparated(debug.global_allocator, "not-present");566 const v = try h.getCommaSeparated(test_allocator, "not-present");
563 testing.expect(null == v);567 testing.expect(null == v);
564 }568 }
565 {569 {
566 const v = (try h.getCommaSeparated(debug.global_allocator, "foo")).?;570 const v = (try h.getCommaSeparated(test_allocator, "foo")).?;
567 defer debug.global_allocator.free(v);571 defer test_allocator.free(v);
568 testing.expectEqualSlices(u8, "bar", v);572 testing.expectEqualSlices(u8, "bar", v);
569 }573 }
570 {574 {
571 const v = (try h.getCommaSeparated(debug.global_allocator, "set-cookie")).?;575 const v = (try h.getCommaSeparated(test_allocator, "set-cookie")).?;
572 defer debug.global_allocator.free(v);576 defer test_allocator.free(v);
573 testing.expectEqualSlices(u8, "x=1,y=2", v);577 testing.expectEqualSlices(u8, "x=1,y=2", v);
574 }578 }
575}579}
576580
577test "Headers.sort" {581test "Headers.sort" {
578 var h = Headers.init(debug.global_allocator);582 var h = Headers.init(test_allocator);
579 defer h.deinit();583 defer h.deinit();
580 try h.append("foo", "bar", null);584 try h.append("foo", "bar", null);
581 try h.append("cookie", "somevalue", null);585 try h.append("cookie", "somevalue", null);
...@@ -596,7 +600,7 @@ test "Headers.sort" {...@@ -596,7 +600,7 @@ test "Headers.sort" {
596}600}
597601
598test "Headers.format" {602test "Headers.format" {
599 var h = Headers.init(debug.global_allocator);603 var h = Headers.init(test_allocator);
600 defer h.deinit();604 defer h.deinit();
601 try h.append("foo", "bar", null);605 try h.append("foo", "bar", null);
602 try h.append("cookie", "somevalue", null);606 try h.append("cookie", "somevalue", null);