BugFix - ProcessScheduler tests green

Author: Martin Lercher

src/JsonRpc/ProcessScheduler.cs

@@ -32,7 +32,7 @@ public void Add(RequestProcessType type, Func<Task> request)
         private Task Start(Func<Task> request)
         {
             var t = request();
-            if (t.Status == TaskStatus.WaitingToRun)
+            if (t.Status == TaskStatus.Created) // || t.Status = TaskStatus.WaitingForActivation ?
                 t.Start();
             return t;
         }
@@ -70,12 +70,21 @@ private void ProcessRequestQueue()
             {
                 if (ex.CancellationToken != token)
                     throw;
-                // else ignore. OperationCanceledException - The CancellationToken has been canceled.
+                // OperationCanceledException - The CancellationToken has been canceled.
+                Task.WaitAll(waitables.ToArray(), TimeSpan.FromMilliseconds(1000));
+                waitables.ForEach((t) =>
+                {
+                    if (!t.IsCompleted) {
+                        // TODO: There is no way to abort a Task. As we don't construct the tasks, we can do nothing here
+                        // Option is: change the task factory "Func<Task> request" to a "Func<CancellationToken, Task> request"
+                    }
+                });
             }
         }
 
         public void Dispose()
         {
+            if (_queueThread == null) return;
             _queueThread = null;
             _cancel.Cancel();
             _cancel.Dispose();

test/JsonRpc.Tests/ProcessSchedulerTests.cs

@@ -27,14 +27,13 @@ public void ShouldScheduleCompletedTask(RequestProcessType type)
         {
             using (IScheduler s = new ProcessScheduler())
             {
-                var done = false;
+                var done = new CountdownEvent(1);
                 s.Start();
                 s.Add(type, () => {
-                    done = true;
+                    done.Signal();
                     return Task.CompletedTask;
                 });
-                Thread.Sleep(SLEEPTIME_MS);
-                done.Should().Be(true);
+                done.Wait(ALONGTIME_MS).Should().Be(true);
             }
         }
 
@@ -58,11 +57,14 @@ public void ShouldScheduleConstructedTask(RequestProcessType type)
         {
             using (IScheduler s = new ProcessScheduler())
             {
-                var done = false;
+                var done = new CountdownEvent(1);
                 s.Start();
-                s.Add(RequestProcessType.Serial, () => new Task(() => done = true));
-                Thread.Sleep(SLEEPTIME_MS);
-                done.Should().Be(true);
+                s.Add(RequestProcessType.Serial, () => {
+                    return new Task(() => {
+                        done.Signal();
+                    });
+                });
+                done.Wait(ALONGTIME_MS).Should().Be(true);
             }
         }