Fixing Flakey FunctionDispatcherTest (#4497)

Author: mhoeger

test/WebJobs.Script.Tests/Rpc/FunctionDispatcherTests.cs

@@ -56,7 +56,7 @@ public async void Starting_MultipleJobhostChannels_Succeeds()
             await functionDispatcher.InitializeAsync(GetTestFunctionsList(LanguageWorkerConstants.NodeLanguageWorkerName));
 
             var finalChannelCount = await WaitForJobhostWorkerChannelsToStartup(functionDispatcher, expectedProcessCount);
-            Assert.Equal(finalChannelCount, expectedProcessCount);
+            Assert.Equal(expectedProcessCount, finalChannelCount);
 
             // Verify LanguageWorkerChannelState when channel after it is initialized
             Assert.True(functionDispatcher.WorkerState.GetChannels().All(ch => ch.State == LanguageWorkerChannelState.Initialized));
@@ -70,46 +70,46 @@ public async void Starting_MultipleWebhostChannels_Succeeds()
             await functionDispatcher.InitializeAsync(GetTestFunctionsList(LanguageWorkerConstants.JavaLanguageWorkerName));
 
             var finalWebhostChannelCount = await WaitForWebhostWorkerChannelsToStartup(functionDispatcher.ChannelManager, expectedProcessCount, "java");
-            Assert.Equal(finalWebhostChannelCount, expectedProcessCount);
+            Assert.Equal(expectedProcessCount, finalWebhostChannelCount);
 
             var finalJobhostChannelCount = functionDispatcher.WorkerState.GetChannels().Count();
-            Assert.Equal(finalJobhostChannelCount, 0);
+            Assert.Equal(0, finalJobhostChannelCount);
         }
 
         [Fact]
         public void MaxProcessCount_Returns_Default()
         {
             FunctionDispatcher functionDispatcher = (FunctionDispatcher)GetTestFunctionDispatcher();
-            Assert.Equal(functionDispatcher.MaxProcessCount, 1);
+            Assert.Equal(1, functionDispatcher.MaxProcessCount);
 
             functionDispatcher = (FunctionDispatcher)GetTestFunctionDispatcher("0");
-            Assert.Equal(functionDispatcher.MaxProcessCount, 1);
+            Assert.Equal(1, functionDispatcher.MaxProcessCount);
 
             functionDispatcher = (FunctionDispatcher)GetTestFunctionDispatcher("-1");
-            Assert.Equal(functionDispatcher.MaxProcessCount, 1);
+            Assert.Equal(1, functionDispatcher.MaxProcessCount);
         }
 
         [Fact]
         public void MaxProcessCount_ProcessCount_Set_Returns_ExpectedCount()
         {
             int expectedProcessCount = 3;
             FunctionDispatcher functionDispatcher = (FunctionDispatcher)GetTestFunctionDispatcher(expectedProcessCount.ToString());
-            Assert.Equal(functionDispatcher.MaxProcessCount, expectedProcessCount);
+            Assert.Equal(expectedProcessCount, functionDispatcher.MaxProcessCount);
         }
 
         [Fact]
         public void MaxProcessCount_ProcessCount_Set_ExceedsMax_Returns_ExpectedCount()
         {
             int expectedProcessCount = 30;
             FunctionDispatcher functionDispatcher = (FunctionDispatcher)GetTestFunctionDispatcher(expectedProcessCount.ToString());
-            Assert.Equal(functionDispatcher.MaxProcessCount, 10);
+            Assert.Equal(10, functionDispatcher.MaxProcessCount);
         }
 
         [Fact]
         public async void FunctionDispatcherState_Default_DotNetFunctions()
         {
             FunctionDispatcher functionDispatcher = (FunctionDispatcher)GetTestFunctionDispatcher();
-            Assert.Equal(functionDispatcher.State, FunctionDispatcherState.Default);
+            Assert.Equal(FunctionDispatcherState.Default, functionDispatcher.State);
             FunctionMetadata func1 = new FunctionMetadata()
             {
                 Name = "func1",
@@ -120,20 +120,20 @@ public async void FunctionDispatcherState_Default_DotNetFunctions()
                 func1
             };
             await functionDispatcher.InitializeAsync(functions);
-            Assert.Equal(functionDispatcher.State, FunctionDispatcherState.Default);
+            Assert.Equal(FunctionDispatcherState.Default, functionDispatcher.State);
 
             await functionDispatcher.InitializeAsync(functions);
-            Assert.Equal(functionDispatcher.State, FunctionDispatcherState.Default);
+            Assert.Equal(FunctionDispatcherState.Default, functionDispatcher.State);
 
             await functionDispatcher.InitializeAsync(functions);
-            Assert.Equal(functionDispatcher.State, FunctionDispatcherState.Default);
+            Assert.Equal(FunctionDispatcherState.Default, functionDispatcher.State);
         }
 
         [Fact]
         public async void FunctionDispatcherState_Default_NoFunctions()
         {
             FunctionDispatcher functionDispatcher = (FunctionDispatcher)GetTestFunctionDispatcher();
-            Assert.Equal(functionDispatcher.State, FunctionDispatcherState.Default);
+            Assert.Equal(FunctionDispatcherState.Default, functionDispatcher.State);
             await functionDispatcher.InitializeAsync(new List<FunctionMetadata>());
         }
 
@@ -142,7 +142,7 @@ public async void ShutdownChannels_NoFunctions()
         {
             var mockLanguageWorkerChannelManager = new Mock<ILanguageWorkerChannelManager>();
             FunctionDispatcher functionDispatcher = (FunctionDispatcher)GetTestFunctionDispatcher(mockLanguageWorkerChannelManager: mockLanguageWorkerChannelManager);
-            Assert.Equal(functionDispatcher.State, FunctionDispatcherState.Default);
+            Assert.Equal(FunctionDispatcherState.Default, functionDispatcher.State);
             await functionDispatcher.InitializeAsync(new List<FunctionMetadata>());
             // Wait longer than debouce action.
             await Task.Delay(6000);
@@ -163,7 +163,7 @@ public async void ShutdownChannels_DotNetFunctions()
             };
             var mockLanguageWorkerChannelManager = new Mock<ILanguageWorkerChannelManager>();
             FunctionDispatcher functionDispatcher = (FunctionDispatcher)GetTestFunctionDispatcher(mockLanguageWorkerChannelManager: mockLanguageWorkerChannelManager);
-            Assert.Equal(functionDispatcher.State, FunctionDispatcherState.Default);
+            Assert.Equal(FunctionDispatcherState.Default, functionDispatcher.State);
             await functionDispatcher.InitializeAsync(functions);
             // Wait longer than debouce action.
             await Task.Delay(6000);
@@ -184,7 +184,7 @@ public async void FunctionDispatcherState_Transitions_From_Starting_To_Initializ
                 func1
             };
             await functionDispatcher.InitializeAsync(functions);
-            Assert.Equal(functionDispatcher.State, FunctionDispatcherState.Initializing);
+            Assert.True(functionDispatcher.State == FunctionDispatcherState.Initializing || functionDispatcher.State == FunctionDispatcherState.Initialized);
             await WaitForFunctionDispactherStateInitialized(functionDispatcher);
         }