motiejus/zig
1
Fork 0
Code Releases Activity

std: update usage of std.testing

Browse Source
This commit is contained in:
Veikka Tuominen
2021-05-04 20:47:26 +03:00
parent 59f9253d94
commit fd77f2cfed
252 changed files with 6144 additions and 6145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/std/Thread/AutoResetEvent.zig
View File

@@ -176,7 +176,7 @@ test "basic usage" {
// test local code paths
{
var event = AutoResetEvent{};
testing.expectError(error.TimedOut, event.timedWait(1));
try testing.expectError(error.TimedOut, event.timedWait(1));
event.set();
event.wait();
}
@@ -192,28 +192,28 @@ test "basic usage" {
const Self = @This();
fn sender(self: *Self) void {
testing.expect(self.value == 0);
fn sender(self: *Self) !void {
try testing.expect(self.value == 0);
self.value = 1;
self.out.set();
self.in.wait();
testing.expect(self.value == 2);
try testing.expect(self.value == 2);
self.value = 3;
self.out.set();
self.in.wait();
testing.expect(self.value == 4);
try testing.expect(self.value == 4);
}
fn receiver(self: *Self) void {
fn receiver(self: *Self) !void {
self.out.wait();
testing.expect(self.value == 1);
try testing.expect(self.value == 1);
self.value = 2;
self.in.set();
self.out.wait();
testing.expect(self.value == 3);
try testing.expect(self.value == 3);
self.value = 4;
self.in.set();
}

4
lib/std/Thread/Mutex.zig
View File

@@ -294,7 +294,7 @@ test "basic usage" {
if (builtin.single_threaded) {
worker(&context);
testing.expect(context.data == TestContext.incr_count);
try testing.expect(context.data == TestContext.incr_count);
} else {
const thread_count = 10;
var threads: [thread_count]*std.Thread = undefined;
@@ -304,7 +304,7 @@ test "basic usage" {
for (threads) |t|
t.wait();
testing.expect(context.data == thread_count * TestContext.incr_count);
try testing.expect(context.data == thread_count * TestContext.incr_count);
}
}

20
lib/std/Thread/ResetEvent.zig
View File

@@ -204,7 +204,7 @@ test "basic usage" {
event.reset();
event.set();
testing.expectEqual(TimedWaitResult.event_set, event.timedWait(1));
try testing.expectEqual(TimedWaitResult.event_set, event.timedWait(1));
// test cross-thread signaling
if (builtin.single_threaded)
@@ -233,25 +233,25 @@ test "basic usage" {
self.* = undefined;
}
fn sender(self: *Self) void {
fn sender(self: *Self) !void {
// update value and signal input
testing.expect(self.value == 0);
try testing.expect(self.value == 0);
self.value = 1;
self.in.set();
// wait for receiver to update value and signal output
self.out.wait();
testing.expect(self.value == 2);
try testing.expect(self.value == 2);
// update value and signal final input
self.value = 3;
self.in.set();
}
fn receiver(self: *Self) void {
fn receiver(self: *Self) !void {
// wait for sender to update value and signal input
self.in.wait();
assert(self.value == 1);
try testing.expect(self.value == 1);
// update value and signal output
self.in.reset();
@@ -260,7 +260,7 @@ test "basic usage" {
// wait for sender to update value and signal final input
self.in.wait();
assert(self.value == 3);
try testing.expect(self.value == 3);
}
fn sleeper(self: *Self) void {
@@ -272,9 +272,9 @@ test "basic usage" {
fn timedWaiter(self: *Self) !void {
self.in.wait();
testing.expectEqual(TimedWaitResult.timed_out, self.out.timedWait(time.ns_per_us));
try testing.expectEqual(TimedWaitResult.timed_out, self.out.timedWait(time.ns_per_us));
try self.out.timedWait(time.ns_per_ms * 100);
testing.expect(self.value == 5);
try testing.expect(self.value == 5);
}
};
@@ -283,7 +283,7 @@ test "basic usage" {
defer context.deinit();
const receiver = try std.Thread.spawn(Context.receiver, &context);
defer receiver.wait();
context.sender();
try context.sender();
if (false) {
// I have now observed this fail on macOS, Windows, and Linux.

20
lib/std/Thread/StaticResetEvent.zig
View File

@@ -320,7 +320,7 @@ test "basic usage" {
event.reset();
event.set();
testing.expectEqual(TimedWaitResult.event_set, event.timedWait(1));
try testing.expectEqual(TimedWaitResult.event_set, event.timedWait(1));
// test cross-thread signaling
if (std.builtin.single_threaded)
@@ -333,25 +333,25 @@ test "basic usage" {
in: StaticResetEvent = .{},
out: StaticResetEvent = .{},
fn sender(self: *Self) void {
fn sender(self: *Self) !void {
// update value and signal input
testing.expect(self.value == 0);
try testing.expect(self.value == 0);
self.value = 1;
self.in.set();
// wait for receiver to update value and signal output
self.out.wait();
testing.expect(self.value == 2);
try testing.expect(self.value == 2);
// update value and signal final input
self.value = 3;
self.in.set();
}
fn receiver(self: *Self) void {
fn receiver(self: *Self) !void {
// wait for sender to update value and signal input
self.in.wait();
assert(self.value == 1);
try testing.expect(self.value == 1);
// update value and signal output
self.in.reset();
@@ -360,7 +360,7 @@ test "basic usage" {
// wait for sender to update value and signal final input
self.in.wait();
assert(self.value == 3);
try testing.expect(self.value == 3);
}
fn sleeper(self: *Self) void {
@@ -372,16 +372,16 @@ test "basic usage" {
fn timedWaiter(self: *Self) !void {
self.in.wait();
testing.expectEqual(TimedWaitResult.timed_out, self.out.timedWait(time.ns_per_us));
try testing.expectEqual(TimedWaitResult.timed_out, self.out.timedWait(time.ns_per_us));
try self.out.timedWait(time.ns_per_ms * 100);
testing.expect(self.value == 5);
try testing.expect(self.value == 5);
}
};
var context = Context{};
const receiver = try std.Thread.spawn(Context.receiver, &context);
defer receiver.wait();
context.sender();
try context.sender();
if (false) {
// I have now observed this fail on macOS, Windows, and Linux.