Skip to content

Commit

Permalink
Test fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@ReubenBond
ReubenBond committed Jul 5, 2024
1 parent fbf2d08 commit 39cf649
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 16 deletions.
6 changes: 4 additions & 2 deletions test/TestInfrastructure/TestExtensions/TestUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,18 @@ public static void ConfigureClientThreadPoolSettingsForStorageTests(int NumDotNe
ServicePointManager.UseNagleAlgorithm = false;
}

public static async Task<int> GetActivationCount(IGrainFactory grainFactory, string fullTypeName)
public static async Task<int> GetActivationCount(IGrainFactory grainFactory, string grainTypeName)
{
int result = 0;

IManagementGrain mgmtGrain = grainFactory.GetGrain<IManagementGrain>(0);
SimpleGrainStatistic[] stats = await mgmtGrain.GetSimpleGrainStatistics();
foreach (var stat in stats)
{
if (stat.GrainType == fullTypeName)
if (string.Equals(stat.GrainType, grainTypeName, StringComparison.Ordinal))
{
result += stat.ActivationCount;
}
}
return result;
}
Expand Down
27 changes: 13 additions & 14 deletions test/TesterInternal/ActivationsLifeCycleTests/ActivationCollectorTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ public async Task ActivationCollectorForceCollection()
await Initialize(DEFAULT_IDLE_TIMEOUT);

const int grainCount = 1000;
var fullGrainTypeName = RuntimeTypeNameFormatter.Format(typeof(IdleActivationGcTestGrain1));

List<Task> tasks = new List<Task>();
logger.LogInformation("ActivationCollectorForceCollection: activating {Count} grains.", grainCount);
Expand All @@ -107,7 +106,7 @@ public async Task ActivationCollectorForceCollection()

await grain.ForceActivationCollection(TimeSpan.FromSeconds(4));

int activationsNotCollected = await TestUtils.GetActivationCount(this.testCluster.GrainFactory, fullGrainTypeName);
int activationsNotCollected = await TestUtils.GetActivationCount(this.testCluster.GrainFactory, "idleactivationgctestgrain1");
Assert.Equal(0, activationsNotCollected);

await grain.ForceActivationCollection(TimeSpan.FromSeconds(4));
Expand All @@ -119,7 +118,7 @@ public async Task ActivationCollectorShouldCollectIdleActivations()
await Initialize(DEFAULT_IDLE_TIMEOUT);

const int grainCount = 1000;
var fullGrainTypeName = RuntimeTypeNameFormatter.Format(typeof(IdleActivationGcTestGrain1));
var fullGrainTypeName = "idleactivationgctestgrain1";

List<Task> tasks = new List<Task>();
logger.LogInformation("IdleActivationCollectorShouldCollectIdleActivations: activating {Count} grains.", grainCount);
Expand Down Expand Up @@ -150,8 +149,8 @@ public async Task ActivationCollectorShouldNotCollectBusyActivations()

const int idleGrainCount = 500;
const int busyGrainCount = 500;
var idleGrainTypeName = RuntimeTypeNameFormatter.Format(typeof(IdleActivationGcTestGrain1));
var busyGrainTypeName = RuntimeTypeNameFormatter.Format(typeof(BusyActivationGcTestGrain1));
var idleGrainTypeName = "idleactivationgctestgrain1";
var busyGrainTypeName = "busyactivationgctestgrain1";

List<Task> tasks0 = new List<Task>();
List<IBusyActivationGcTestGrain1> busyGrains = new List<IBusyActivationGcTestGrain1>();
Expand Down Expand Up @@ -212,8 +211,8 @@ public async Task ManualCollectionShouldNotCollectBusyActivations()
TimeSpan shortIdleTimeout = TimeSpan.FromSeconds(1);
const int idleGrainCount = 500;
const int busyGrainCount = 500;
var idleGrainTypeName = RuntimeTypeNameFormatter.Format(typeof(IdleActivationGcTestGrain1));
var busyGrainTypeName = RuntimeTypeNameFormatter.Format(typeof(BusyActivationGcTestGrain1));
var idleGrainTypeName = "idleactivationgctestgrain1";
var busyGrainTypeName = "busyactivationgctestgrain1";

List<Task> tasks0 = new List<Task>();
List<IBusyActivationGcTestGrain1> busyGrains = new List<IBusyActivationGcTestGrain1>();
Expand Down Expand Up @@ -286,7 +285,7 @@ public async Task ActivationCollectorShouldCollectIdleActivationsSpecifiedInPerT
await Initialize(defaultCollectionAgeLimit);

const int grainCount = 1000;
var fullGrainTypeName = RuntimeTypeNameFormatter.Format(typeof(IdleActivationGcTestGrain2));
var fullGrainTypeName = "idleactivationgctestgrain2";

List<Task> tasks = new List<Task>();
logger.LogInformation("ActivationCollectorShouldCollectIdleActivationsSpecifiedInPerTypeConfiguration: activating {Count} grains.", grainCount);
Expand Down Expand Up @@ -319,8 +318,8 @@ public async Task ActivationCollectorShouldNotCollectBusyActivationsSpecifiedInP

const int idleGrainCount = 500;
const int busyGrainCount = 500;
var idleGrainTypeName = RuntimeTypeNameFormatter.Format(typeof(IdleActivationGcTestGrain2));
var busyGrainTypeName = RuntimeTypeNameFormatter.Format(typeof(BusyActivationGcTestGrain2));
var idleGrainTypeName = "idleactivationgctestgrain2";
var busyGrainTypeName = "busyactivationgctestgrain2";

List<Task> tasks0 = new List<Task>();
List<IBusyActivationGcTestGrain2> busyGrains = new List<IBusyActivationGcTestGrain2>();
Expand Down Expand Up @@ -390,7 +389,7 @@ public async Task ActivationCollectorShouldNotCollectBusyStatelessWorkers()
// 7. ensure that test steps 2-6 are repeatable.

const int grainCount = 1;
var grainTypeName = RuntimeTypeNameFormatter.Format(typeof(StatelessWorkerActivationCollectorTestGrain1));
var grainTypeName = "statelessworkeractivationcollectortestgrain1";
const int burstLength = 1000;

List<Task> tasks0 = new List<Task>();
Expand Down Expand Up @@ -496,8 +495,8 @@ public async Task ActivationCollectorShouldNotCauseMessageLoss()

const int idleGrainCount = 0;
const int busyGrainCount = 500;
var idleGrainTypeName = RuntimeTypeNameFormatter.Format(typeof(IdleActivationGcTestGrain1));
var busyGrainTypeName = RuntimeTypeNameFormatter.Format(typeof(BusyActivationGcTestGrain1));
var idleGrainTypeName = "idleactivationgctestgrain1";
var busyGrainTypeName = "busyactivationgctestgrain1";
const int burstCount = 100;

List<Task> tasks0 = new List<Task>();
Expand Down Expand Up @@ -550,7 +549,7 @@ public async Task ActivationCollectorShouldCollectByCollectionSpecificAgeLimitFo
const int grainCount = 1000;

// CollectionAgeLimit = 12 seconds
var fullGrainTypeName = RuntimeTypeNameFormatter.Format(typeof(CollectionSpecificAgeLimitForTenSecondsActivationGcTestGrain));
var fullGrainTypeName = "collectionspecificAgelimitfortensecondsactivationgctest";

List<Task> tasks = new List<Task>();
logger.LogInformation("ActivationCollectorShouldCollectByCollectionSpecificAgeLimit: activating {GrainCount} grains.", grainCount);
Expand Down

0 comments on commit 39cf649

Please sign in to comment.