Changes to help test steps pass in CI (#88)

Changes to help test steps pass in CI

Author: Tim Hess

azure-pipelines.yml

@@ -28,6 +28,12 @@ jobs:
     inputs:
       filePath: src/Connectors/EnableGemFire.ps1
       arguments: $(PivNetAPIToken)
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      packageType: sdk
+      version: 2.2.300
+      installationPath: $(Agent.ToolsDirectory)/dotnet
   - task: DotNetCoreCLI@2
     inputs:
       command: restore
@@ -51,6 +57,12 @@ jobs:
     inputs:
       filePath: src/Connectors/EnableGemFire.ps1
       arguments: $(PivNetAPIToken)
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      packageType: sdk
+      version: 2.2.300
+      installationPath: $(Agent.ToolsDirectory)/dotnet
   - task: DotNetCoreCLI@2
     inputs:
       command: restore
@@ -83,13 +95,16 @@ jobs:
     inputs:
       filePath: src/Connectors/EnableGemFire.ps1
       arguments: $(PivNetAPIToken)
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      packageType: sdk
+      version: 2.2.300
+      installationPath: $(Agent.ToolsDirectory)/dotnet
   - task: DotNetCoreCLI@2
     inputs:
       command: 'restore'
-      feedsToUse: 'config'
-      nugetConfigPath: NuGet.config
       projects: 'src/Steeltoe.All.sln'
-      verbosityRestore: normal
   - task: SonarSource.sonarcloud.14d9cde6-c1da-4d55-aa01-2965cd301255.SonarCloudPrepare@1
     displayName: 'Prepare analysis on SonarCloud'
     inputs:

src/CircuitBreaker/src/HystrixBase/HystrixCommand.cs

@@ -107,15 +107,9 @@ public HystrixCommand(
             return base.ExecuteAsync();
         }
 
-        protected new virtual void Run()
-        {
-            _ = RunAsync().GetAwaiter().GetResult();
-        }
+        protected new virtual void Run() => RunAsync().GetAwaiter().GetResult();
 
-        protected new virtual void RunFallback()
-        {
-            _ = RunFallbackAsync().GetAwaiter().GetResult();
-        }
+        protected new virtual void RunFallback() => RunFallbackAsync().GetAwaiter().GetResult();
 
         protected override Unit DoRun()
         {

src/CircuitBreaker/src/HystrixBase/HystrixRequestLog.cs

@@ -210,7 +210,7 @@ public string GetExecutedCommandsAsString()
             }
             catch (Exception)
             {
-                // logger.error("Failed to create HystrixRequestLog response header string.", e);
+                // logger.error("Failed to create HystrixRequestLog response header string.", e)
                 // don't let this cause the entire app to fail so just return "Unknown"
                 return "Unknown";
             }

src/CircuitBreaker/src/HystrixBase/Strategy/Concurrency/HystrixTaskScheduler.cs

@@ -108,20 +108,13 @@ public void Dispose()
 
         public bool IsShutdown => shutdown;
 
-        private bool disposed;
-
         protected virtual void Dispose(bool disposing)
         {
-            if (!disposed)
+            if (disposing)
             {
-                if (disposing)
-                {
-                    shutdown = true;
-
-                    Time.WaitUntil(() => { return runningThreads <= 0; }, 500);
-                }
+                shutdown = true;
 
-                disposed = true;
+                Time.WaitUntil(() => { return runningThreads <= 0; }, 500);
             }
         }
 

src/CircuitBreaker/src/HystrixBase/Util/SemaphoreSlimExtensions.cs

@@ -25,7 +25,7 @@ public static bool TryAcquire(this SemaphoreSlim sema)
                 return true;
             }
 
-            return sema.Wait(1);
+            return sema.Wait(0);
         }
     }
 }

src/CircuitBreaker/src/HystrixBase/Util/TimerReference.cs

@@ -51,8 +51,6 @@ public void Run(CancellationToken token)
             }
         }
 
-        private bool disposed = false;
-
         public void Dispose()
         {
             Dispose(true);
@@ -61,26 +59,16 @@ public void Dispose()
 
         protected virtual void Dispose(bool disposing)
         {
-            if (!disposed)
+            if (disposing)
             {
-                if (disposing)
+                if (!_tokenSource.IsCancellationRequested)
                 {
-                    if (!_tokenSource.IsCancellationRequested)
-                    {
-                        _tokenSource.Cancel();
-                    }
-
-                    _listener = null;
-                    _timerTask = null;
+                    _tokenSource.Cancel();
                 }
 
-                disposed = true;
+                _listener = null;
+                _timerTask = null;
             }
         }
-
-        ~TimerReference()
-        {
-            Dispose(false);
-        }
     }
 }

src/CircuitBreaker/test/HystrixBase.Test/Config/HystrixConfigurationStreamTest.cs

@@ -42,6 +42,7 @@ public HystrixConfigurationStreamTest(ITestOutputHelper output)
         }
 
         [Fact]
+        [Trait("Category", "FlakyOnHostedAgents")]
         public void TestStreamHasData()
         {
             AtomicBoolean commandShowsUp = new AtomicBoolean(false);
@@ -79,12 +80,13 @@ public void TestStreamHasData()
                     latch.SignalEx();
                 });
 
-            Assert.True(latch.Wait(10000));
+            Assert.True(latch.Wait(10000), "CountdownEvent was not set!");
             Assert.True(commandShowsUp.Value);
             Assert.True(threadPoolShowsUp.Value);
         }
 
         [Fact]
+        [Trait("Category", "FlakyOnHostedAgents")]
         public void TestTwoSubscribersOneUnsubscribes()
         {
             CountdownEvent latch1 = new CountdownEvent(1);
@@ -160,6 +162,7 @@ public void TestTwoSubscribersOneUnsubscribes()
         }
 
         [Fact]
+        [Trait("Category", "FlakyOnHostedAgents")]
         public void TestTwoSubscribersBothUnsubscribe()
         {
             CountdownEvent latch1 = new CountdownEvent(1);
@@ -236,6 +239,7 @@ public void TestTwoSubscribersBothUnsubscribe()
         }
 
         [Fact]
+        [Trait("Category", "FlakyOnHostedAgents")]
         public void TestTwoSubscribersOneSlowOneFast()
         {
             CountdownEvent latch = new CountdownEvent(1);