fix test

Author: Toshad

ExtractorUtils.Test/unit/Unstable/RuntimeTest.cs

@@ -186,8 +186,16 @@ private ExtractorRuntimeBuilder<DummyConfig, DummyExtractor> CreateMockRuntimeBu
             return builder;
         }
 
-        private async Task<(DummyExtractor, ExtractorRuntime<DummyConfig, DummyExtractor>)> createExtractorForRestartTest(ManualResetEventSlim evt, ExtractorRuntimeBuilder<DummyConfig, DummyExtractor> builder, CancellationToken token)
+        [Fact(Timeout = 5000)]
+        public async Task TestRuntimeRestartNewConfig()
         {
+            var builder = CreateMockRuntimeBuilder();
+            // Restart policy won't be the default "Always" in customer envs, but we should 
+            // still restart on config change. 
+            builder.RestartPolicy = ExtractorRestartPolicy.OnError;
+
+            using var evt = new ManualResetEventSlim(false);
+
             DummyExtractor extractor = null;
             builder.OnCreateExtractor = (_, ext) =>
             {
@@ -198,27 +206,15 @@ private ExtractorRuntimeBuilder<DummyConfig, DummyExtractor> CreateMockRuntimeBu
                 };
             };
 
-            var runtime = await builder.MakeRuntime(token);
+            using var source = new CancellationTokenSource();
+
+            var runtime = await builder.MakeRuntime(source.Token);
             var runTask = runtime.Run();
 
-            Assert.True(await CommonUtils.WaitAsync(evt.WaitHandle, TimeSpan.FromSeconds(5), token));
+            Assert.True(await CommonUtils.WaitAsync(evt.WaitHandle, TimeSpan.FromSeconds(5), source.Token));
             Assert.NotNull(extractor);
-            return (extractor, runtime);
-        }
-
-        [Fact(Timeout = 5000)]
-        public async Task TestRuntimeRestartNewConfig()
-        {
-            var builder = CreateMockRuntimeBuilder();
-            // Restart policy won't be the default "Always" in customer envs, but we should 
-            // still restart on config change. 
-            builder.RestartPolicy = ExtractorRestartPolicy.OnError;
-
-            using var evt = new ManualResetEventSlim(false);
-            using var source = new CancellationTokenSource();
-
-            var (extractor, runtime) = await createExtractorForRestartTest(evt, builder, source.Token);
 
+            // Wait for a startup to be reported.
             await TestUtils.WaitForCondition(() => _startupCount == 1, 5);
 
             // Update the config revision and the extractor should be restarted.
@@ -243,43 +239,9 @@ public async Task TestRuntimeRestartNewConfig()
             // Finally, shut down the extractor.
             source.Cancel();
 
-            await runtime.Run();
-        }
-
-        [Fact(Timeout = 5000)]
-        public async Task TestNeverRestartPolicy()
-        {
-            var builder = CreateMockRuntimeBuilder();
-            // Restart policy won't be the default "Always" in customer envs, but we should 
-            // still restart on config change. 
-            builder.RestartPolicy = ExtractorRestartPolicy.Never;
-
-            using var evt = new ManualResetEventSlim(false);
-            using var source = new CancellationTokenSource();
-
-            var (extractor, runtime) = await createExtractorForRestartTest(evt, builder, source.Token);
-            // Wait for a startup to be reported.
-            await TestUtils.WaitForCondition(() => _startupCount == 1, 5);
-
-            // Update the config revision and the extractor should be restarted.
-            var oldExtractor = extractor;
-            extractor = null;
-            evt.Reset();
-            _responseRevision = new ConfigRevision
-            {
-                Revision = 2,
-                Config = "foo: baz"
-            };
-
-            // Flush the sink to speed things along
-            await oldExtractor.Sink.Flush(source.Token);
-
-            // Extractor should not be restarted, so we should time out waiting for the event to be set.
-            Assert.False(await CommonUtils.WaitAsync(evt.WaitHandle, TimeSpan.FromSeconds(1), source.Token));
-            Assert.Null(extractor);
+            await runTask;
         }
 
-
         [Fact(Timeout = 5000)]
         public async Task TestRuntimeRestartExtractorCrash()
         {

ExtractorUtils/Unstable/Configuration/ConfigSource.cs

@@ -155,7 +155,7 @@ public override async Task<bool> ResolveConfig(int? targetRevision, BaseErrorRep
                 var msg = ex.Message;
                 if (_lastErrorMsg != msg)
                 {
-                    reporter.Fatal($"Fatally failed to load configuration file {_configFilePath}: {ex.Message}", ex.Message + "\n" + ex.StackTrace);
+                    reporter.Fatal($"Fatally failed to load configuration file from {_configFilePath}: {ex.Message}");
                 }
                 _lastErrorMsg = msg;
                 throw;
@@ -170,7 +170,7 @@ public override async Task<bool> ResolveConfig(int? targetRevision, BaseErrorRep
             {
                 if (isNewConfig)
                 {
-                    reporter.Fatal($"Failed to parse configuration file {_configFilePath}: {ex.Message}", ex.Message + "\n" + ex.StackTrace);
+                    reporter.Fatal($"Failed to parse configuration file from {_configFilePath}: {ex.Message}");
                 }
                 throw;
             }
@@ -256,7 +256,7 @@ public override async Task<bool> ResolveConfig(int? targetRevision, BaseErrorRep
                 var msg = ex.Message;
                 if (_lastErrorMsg != msg)
                 {
-                    reporter.Fatal($"Fatally failed to load0 configuration file from CDF: {msg}", msg + "\n" + ex.StackTrace);
+                    reporter.Fatal($"Fatally failed to load configuration file from CDF: {msg}");
                 }
                 _lastErrorMsg = msg;
                 throw;
@@ -275,7 +275,7 @@ public override async Task<bool> ResolveConfig(int? targetRevision, BaseErrorRep
             {
                 if (isNewConfig)
                 {
-                    reporter.Fatal($"Failed to parse configuration file from CDF: {ex.Message}", ex.Message + "\n" + ex.StackTrace);
+                    reporter.Fatal($"Failed to parse configuration file from CDF: {ex.Message}");
                 }
                 throw;
             }