Fix repeated events in dotnet client watching. (#289)

armadaproject · Dec 20, 2019 · 15a3a4d · 15a3a4d
1 parent 0ce6a3c
commit 15a3a4d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/client/DotNet/Armada.Client.Test/Tests.cs b/client/DotNet/Armada.Client.Test/Tests.cs
@@ -33,7 +33,7 @@ public async Task TestWatchingEvents()
                 Task.Run(() => client.WatchEvents(jobSet, null,  cts.Token, m => eventCount++, e => throw e));
                 await Task.Delay(TimeSpan.FromMinutes(2));
                 cts.Cancel();
-                Assert.That(eventCount, Is.GreaterThan(0));
+                Assert.That(eventCount, Is.EqualTo(4));
             }
         }
 

diff --git a/client/DotNet/Armada.Client/Client.cs b/client/DotNet/Armada.Client/Client.cs
@@ -108,6 +108,7 @@ public async Task WatchEvents(
                                         this.JsonSerializerSettings);
 
                                 onMessage(eventMessage);
+                                fromMessageId = eventMessage.Result?.Id ?? fromMessageId;
                             }
                         }
                         catch (IOException)