fix flaky logger (#782)

* fix flaky logger * update env related dep * build info
kubernetes-client · Feb 20, 2022 · 8a39035 · 8a39035
1 parent 29f9aa9
commit 8a39035
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/buildtest.yaml b/.github/workflows/buildtest.yaml
@@ -28,7 +28,7 @@ jobs:
       #   if: matrix.os == 'ubuntu-latest'
       #   run: dotnet format --severity error --verify-no-changes --exclude ./src/KubernetesClient/generated/
       - name: Build
-        run: dotnet build --configuration Release
+        run: dotnet build --configuration Release -v detailed
       - name: Test
         run: dotnet test /p:CollectCoverage=true /p:ExcludeByFile=\"**/KubernetesClient/generated/**/*.cs\" /p:CoverletOutputFormat="cobertura"
       # - uses: 5monkeys/cobertura-action@master

diff --git a/src/KubernetesClient/KubernetesClient.csproj b/src/KubernetesClient/KubernetesClient.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Authors>The Kubernetes Project Authors</Authors>
@@ -32,18 +32,18 @@
 
   <ItemGroup>
    <AdditionalFiles Include="swagger.json" />
-   <ProjectReference Include="..\..\gen\LibKubernetesGenerator\LibKubernetesGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"  />
+   <ProjectReference Include="..\..\gen\LibKubernetesGenerator\LibKubernetesGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="10.1.1" />
     <PackageReference Include="Fractions" Version="7.0.0" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.240" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255" PrivateAssets="all" />
     <PackageReference Include="prometheus-net" Version="5.0.1" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.13.1" />
     <PackageReference Include="System.IO.Abstractions" Version="13.2.47" />
     <PackageReference Include="YamlDotNet" Version="11.2.1" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="IdentityModel.OidcClient" Version="4.0.0" />
 
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.23" />

diff --git a/tests/KubernetesClient.Tests/Logging/TestOutputLogger.cs b/tests/KubernetesClient.Tests/Logging/TestOutputLogger.cs
@@ -98,15 +98,12 @@ public void Log<TState>(LogLevel level, EventId eventId, TState state, Exception
                         exception.ToString());
                 }
             }
-            catch (AggregateException e)
+            catch (Exception e)
             {
                 // ignore 'There is no currently active test.'
-                foreach (var inner in e.InnerExceptions)
+                if (e.ToString().Contains("There is no currently active test"))
                 {
-                    if (inner.Message.Contains("There is no currently active test"))
-                    {
-                        return;
-                    }
+                    return;
                 }
 
                 throw;