Commit 77c8af09 authored by Nick Craver's avatar Nick Craver

Issue 182: remove task .Wait() calls

This isn't the source of our timeouts...as there aren't running. But cleaning up usages.
parent 843348f6
using System; using System;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
using Xunit; using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;
...@@ -12,7 +13,7 @@ public class Issue182 : TestBase ...@@ -12,7 +13,7 @@ public class Issue182 : TestBase
public Issue182(ITestOutputHelper output) : base (output) { } public Issue182(ITestOutputHelper output) : base (output) { }
[FactLongRunning] [FactLongRunning]
public void SetMembers() public async Task SetMembers()
{ {
using (var conn = Create()) using (var conn = Create())
{ {
...@@ -27,20 +28,19 @@ public void SetMembers() ...@@ -27,20 +28,19 @@ public void SetMembers()
var key = Me(); var key = Me();
const int count = (int)5e6; const int count = (int)5e6;
db.KeyDeleteAsync(key).Wait(); conn.Wait(db.KeyDeleteAsync(key));
foreach (var _ in Enumerable.Range(0, count)) foreach (var _ in Enumerable.Range(0, count))
db.SetAdd(key, Guid.NewGuid().ToByteArray(), CommandFlags.FireAndForget); db.SetAdd(key, Guid.NewGuid().ToByteArray(), CommandFlags.FireAndForget);
Assert.Equal(count, db.SetLengthAsync(key).Result); // SCARD for set Assert.Equal(count, db.SetLengthAsync(key).Result); // SCARD for set
var task = db.SetMembersAsync(key); var result = await db.SetMembersAsync(key);
task.Wait(); Assert.Equal(count, result.Length); // SMEMBERS result length
Assert.Equal(count, task.Result.Length); // SMEMBERS result length
} }
} }
[FactLongRunning] [FactLongRunning]
public void SetUnion() public async Task SetUnion()
{ {
using (var conn = Create()) using (var conn = Create())
{ {
...@@ -50,9 +50,9 @@ public void SetUnion() ...@@ -50,9 +50,9 @@ public void SetUnion()
var key2 = Me() + ":2"; var key2 = Me() + ":2";
var dstkey = Me() + ":dst"; var dstkey = Me() + ":dst";
db.KeyDeleteAsync(key1).Wait(); await db.KeyDeleteAsync(key1);
db.KeyDeleteAsync(key2).Wait(); await db.KeyDeleteAsync(key2);
db.KeyDeleteAsync(dstkey).Wait(); await db.KeyDeleteAsync(dstkey);
const int count = (int)5e6; const int count = (int)5e6;
foreach (var _ in Enumerable.Range(0, count)) foreach (var _ in Enumerable.Range(0, count))
...@@ -63,7 +63,7 @@ public void SetUnion() ...@@ -63,7 +63,7 @@ public void SetUnion()
Assert.Equal(count, db.SetLengthAsync(key1).Result); // SCARD for set 1 Assert.Equal(count, db.SetLengthAsync(key1).Result); // SCARD for set 1
Assert.Equal(count, db.SetLengthAsync(key2).Result); // SCARD for set 2 Assert.Equal(count, db.SetLengthAsync(key2).Result); // SCARD for set 2
db.SetCombineAndStoreAsync(SetOperation.Union, dstkey, key1, key2).Wait(); await db.SetCombineAndStoreAsync(SetOperation.Union, dstkey, key1, key2);
var dstLen = db.SetLength(dstkey); var dstLen = db.SetLength(dstkey);
Assert.Equal(count * 2, dstLen); // SCARD for destination set Assert.Equal(count * 2, dstLen); // SCARD for destination set
} }
......
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