Skip to content

tests(Diagnostics): Loosen some tests that flake because of data freshness #15663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amanda-tarafa merged 2 commits into from
Jun 11, 2026
+14 −3
Merged

tests(Diagnostics): Loosen some tests that flake because of data freshness #15663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b904ff6
chore(Diagnostics): Add Common.IntegrationTests project to the AspNet…
amanda-tarafa Jun 11, 2026
15171e9
tests(Diagnostics): Loosen some tests and poll for longer.
amanda-tarafa Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ....AspNetCore3/Google.Cloud.Diagnostics.AspNetCore3.IntegrationTests/Logging/LoggingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ public async Task Logging_ManyEntries()
}
_fixture.AddValidator(testId, results =>
{
Assert.Equal(1000, results.Count);
// We logged 1000 entries, but because of data freshness we sometimes se around 990,
// that's fine, let's expect more than 950.
Assert.InRange(results.Count, 950, 1000);
Assert.All(results, l =>
{
Assert.NotEqual(LogSeverity.Debug, l.Severity);
Expand Down
9 changes: 9 additions & 0 deletions apis/Google.Cloud.Diagnostics.AspNetCore3/Google.Cloud.Diagnostics.AspNetCore3.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.Cloud.ClientTesting"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.Cloud.Diagnostics.Common", "..\Google.Cloud.Diagnostics.Common\Google.Cloud.Diagnostics.Common\Google.Cloud.Diagnostics.Common.csproj", "{2FA0133E-01FE-AA78-78FE-944CB8AEAEC3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.Cloud.Diagnostics.Common.IntegrationTests", "..\Google.Cloud.Diagnostics.Common\Google.Cloud.Diagnostics.Common.IntegrationTests\Google.Cloud.Diagnostics.Common.IntegrationTests.csproj", "{23313188-9132-3B57-B751-A7557CE55247}"
Comment thread
efevans marked this conversation as resolved.
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -45,8 +47,15 @@ Global
{2FA0133E-01FE-AA78-78FE-944CB8AEAEC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FA0133E-01FE-AA78-78FE-944CB8AEAEC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FA0133E-01FE-AA78-78FE-944CB8AEAEC3}.Release|Any CPU.Build.0 = Release|Any CPU
{23313188-9132-3B57-B751-A7557CE55247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{23313188-9132-3B57-B751-A7557CE55247}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23313188-9132-3B57-B751-A7557CE55247}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23313188-9132-3B57-B751-A7557CE55247}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A4A5A2EC-9517-4CB1-8347-5D8FFE174AA9}
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions ...Google.Cloud.Diagnostics.Common.IntegrationTests/ErrorReporting/ErrorEventEntryPolling.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2017 Google Inc. All Rights Reserved.
// Copyright 2017 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -40,7 +40,7 @@ private ErrorEventEntryPolling(TimeSpan? timeout, TimeSpan? sleepInterval)
: base(timeout, sleepInterval)
{ }

public static ErrorEventEntryPolling Default { get; } = new ErrorEventEntryPolling(null, null);
public static ErrorEventEntryPolling Default { get; } = new ErrorEventEntryPolling(TimeSpan.FromMinutes(15), null);

public static ErrorEventEntryPolling NoRetry { get; } = new ErrorEventEntryPolling(TimeSpan.Zero, TimeSpan.Zero);

Expand Down
Loading