kubernetes-client/csharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix flaky logger (#782)

Browse Source 
* fix flaky logger

* update env related dep

* build info
This commit is contained in:
Boshi Lian
2022-02-20 14:34:10 -08:00
committed by GitHub
parent 29f9aa9df4
commit 8a39035055
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/buildtest.yaml vendored
View File

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

8
src/KubernetesClient/KubernetesClient.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Authors>The Kubernetes Project Authors</Authors> <Authors>The Kubernetes Project Authors</Authors>
@@ -32,18 +32,18 @@
<ItemGroup> <ItemGroup>
<AdditionalFiles Include="swagger.json" /> <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>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper" Version="10.1.1" /> <PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="Fractions" Version="7.0.0" /> <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="prometheus-net" Version="5.0.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.13.1" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.13.1" />
<PackageReference Include="System.IO.Abstractions" Version="13.2.47" /> <PackageReference Include="System.IO.Abstractions" Version="13.2.47" />
<PackageReference Include="YamlDotNet" Version="11.2.1" /> <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="IdentityModel.OidcClient" Version="4.0.0" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.23" /> <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.23" />

9
tests/KubernetesClient.Tests/Logging/TestOutputLogger.cs
View File

@@ -98,15 +98,12 @@ namespace k8s.Tests.Logging
exception.ToString()); exception.ToString());
} }
} }
catch (AggregateException e) catch (Exception e)
{ {
// ignore 'There is no currently active test.' // 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; throw;