Skip to content

Commit 8a39035

Browse files
authored
fix flaky logger (#782)
* fix flaky logger * update env related dep * build info
1 parent 29f9aa9 commit 8a39035

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

.github/workflows/buildtest.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# if: matrix.os == 'ubuntu-latest'
2929
# run: dotnet format --severity error --verify-no-changes --exclude ./src/KubernetesClient/generated/
3030
- name: Build
31-
run: dotnet build --configuration Release
31+
run: dotnet build --configuration Release -v detailed
3232
- name: Test
3333
run: dotnet test /p:CollectCoverage=true /p:ExcludeByFile=\"**/KubernetesClient/generated/**/*.cs\" /p:CoverletOutputFormat="cobertura"
3434
# - uses: 5monkeys/cobertura-action@master

src/KubernetesClient/KubernetesClient.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Authors>The Kubernetes Project Authors</Authors>
@@ -32,18 +32,18 @@
3232

3333
<ItemGroup>
3434
<AdditionalFiles Include="swagger.json" />
35-
<ProjectReference Include="..\..\gen\LibKubernetesGenerator\LibKubernetesGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
35+
<ProjectReference Include="..\..\gen\LibKubernetesGenerator\LibKubernetesGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
3636
</ItemGroup>
3737

3838
<ItemGroup>
3939
<PackageReference Include="AutoMapper" Version="10.1.1" />
4040
<PackageReference Include="Fractions" Version="7.0.0" />
41-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.240" PrivateAssets="all" />
41+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255" PrivateAssets="all" />
4242
<PackageReference Include="prometheus-net" Version="5.0.1" />
4343
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.13.1" />
4444
<PackageReference Include="System.IO.Abstractions" Version="13.2.47" />
4545
<PackageReference Include="YamlDotNet" Version="11.2.1" />
46-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
46+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
4747
<PackageReference Include="IdentityModel.OidcClient" Version="4.0.0" />
4848

4949
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.23" />

tests/KubernetesClient.Tests/Logging/TestOutputLogger.cs

+3-6
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,12 @@ public void Log<TState>(LogLevel level, EventId eventId, TState state, Exception
9898
exception.ToString());
9999
}
100100
}
101-
catch (AggregateException e)
101+
catch (Exception e)
102102
{
103103
// ignore 'There is no currently active test.'
104-
foreach (var inner in e.InnerExceptions)
104+
if (e.ToString().Contains("There is no currently active test"))
105105
{
106-
if (inner.Message.Contains("There is no currently active test"))
107-
{
108-
return;
109-
}
106+
return;
110107
}
111108

112109
throw;

0 commit comments

Comments
 (0)