Commit 84221940 authored by Paul's avatar Paul
Browse files

Formatting

parent ffd28167
...@@ -292,7 +292,8 @@ TEST_CASE(zero_merge3) ...@@ -292,7 +292,8 @@ TEST_CASE(zero_merge3)
EXPECT(get_wait_for(id).empty()); EXPECT(get_wait_for(id).empty());
// Stream assignment for final op // Stream assignment for final op
EXPECT(t.get_stream(final) == 0); EXPECT(t.get_stream(final) == 0);
EXPECT(get_wait_for(final) == get_wait_for(t.get_stream(final), {t.get_stream(onep1), t.get_stream(onep2)})); EXPECT(get_wait_for(final) ==
get_wait_for(t.get_stream(final), {t.get_stream(onep1), t.get_stream(onep2)}));
EXPECT(check_conflicts(p, onep1, onep2)); EXPECT(check_conflicts(p, onep1, onep2));
} }
...@@ -316,7 +317,8 @@ TEST_CASE(zero_merge4) ...@@ -316,7 +317,8 @@ TEST_CASE(zero_merge4)
EXPECT(get_wait_for(id).empty()); EXPECT(get_wait_for(id).empty());
// Stream assignment for final op // Stream assignment for final op
EXPECT(t.get_stream(final) == 0); EXPECT(t.get_stream(final) == 0);
EXPECT(get_wait_for(final) == get_wait_for(t.get_stream(final), {t.get_stream(onep1), t.get_stream(onep2)})); EXPECT(get_wait_for(final) ==
get_wait_for(t.get_stream(final), {t.get_stream(onep1), t.get_stream(onep2)}));
EXPECT(check_conflicts(p, onep1, onep2)); EXPECT(check_conflicts(p, onep1, onep2));
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment