Skip to content

Commit 94e1423

Browse files
brdeyobrdeyo
committed
Bug fix. GetPlatformSpecificPackage does not handle throwIfNotFound = false correctly. Refactor into a more complete implementation. Perform some cleanup of the test framework foundations related to the change.
1 parent a5295c0 commit 94e1423

132 files changed

Lines changed: 3851 additions & 3127 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.16.27
1+
1.16.28

‎src/VirtualClient/Module.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<Microsoft_Extensions_Http_Polly_PackageVersion>8.0.8</Microsoft_Extensions_Http_Polly_PackageVersion>
8888

8989
<!-- Microsoft.Windows.Compatibility -->
90-
<Microsoft_Windows_Compatibility_PackageVersion>8.0.11</Microsoft_Windows_Compatibility_PackageVersion>
90+
<Microsoft_Windows_Compatibility_PackageVersion>8.0.13</Microsoft_Windows_Compatibility_PackageVersion>
9191

9292
<!-- Microsoft.Win32.Registry -->
9393
<Microsoft_Win32_Registry_PackageVersion>5.0.0</Microsoft_Win32_Registry_PackageVersion>
@@ -120,7 +120,7 @@
120120
<Serilog_Sinks_RollingFile_PackageVersion>3.3.0</Serilog_Sinks_RollingFile_PackageVersion>
121121

122122
<!-- SSH.Net -->
123-
<SSH_Net_PackageVersion>2024.0.0</SSH_Net_PackageVersion>
123+
<SSH_Net_PackageVersion>2024.2.0</SSH_Net_PackageVersion>
124124

125125
<!-- System.CommandLine -->
126126
<System_CommandLine_PackageVersion>2.0.0-beta1.21308.1</System_CommandLine_PackageVersion>

‎src/VirtualClient/VirtualClient.Actions.FunctionalTests/AspNetBenchProfileTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,17 +131,17 @@ private void SetupDefaultMockBehaviors(PlatformID platform)
131131
if (platform == PlatformID.Win32NT)
132132
{
133133
this.mockFixture.Setup(PlatformID.Win32NT);
134-
this.mockFixture.SetupWorkloadPackage("aspnetbenchmarks", expectedFiles: @"aspnetbench");
135-
this.mockFixture.SetupWorkloadPackage("bombardier", expectedFiles: @"win-x64\bombardier.exe");
136-
this.mockFixture.SetupWorkloadPackage("dotnetsdk", expectedFiles: @"packages\dotnet\dotnet.exe");
134+
this.mockFixture.SetupPackage("aspnetbenchmarks", expectedFiles: @"aspnetbench");
135+
this.mockFixture.SetupPackage("bombardier", expectedFiles: @"win-x64\bombardier.exe");
136+
this.mockFixture.SetupPackage("dotnetsdk", expectedFiles: @"packages\dotnet\dotnet.exe");
137137
}
138138
else
139139
{
140140
this.mockFixture.Setup(PlatformID.Unix);
141141

142-
this.mockFixture.SetupWorkloadPackage("aspnetbenchmarks", expectedFiles: @"aspnetbench");
143-
this.mockFixture.SetupWorkloadPackage("bombardier", expectedFiles: @"linux-x64\bombardier");
144-
this.mockFixture.SetupWorkloadPackage("dotnetsdk", expectedFiles: @"packages\dotnet\dotnet");
142+
this.mockFixture.SetupPackage("aspnetbenchmarks", expectedFiles: @"aspnetbench");
143+
this.mockFixture.SetupPackage("bombardier", expectedFiles: @"linux-x64\bombardier");
144+
this.mockFixture.SetupPackage("dotnetsdk", expectedFiles: @"packages\dotnet\dotnet");
145145
}
146146

147147
this.mockFixture.SetupDisks(withRemoteDisks: false);

‎src/VirtualClient/VirtualClient.Actions.FunctionalTests/CompressionProfileTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public async Task CompressionWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPl
5555
// - The workload generates valid results.
5656
this.mockFixture.Setup(platformID, architecture);
5757
this.mockFixture.SetupDisks(withRemoteDisks: false);
58-
this.mockFixture.SetupWorkloadPackage("Compression");
58+
this.mockFixture.SetupPackage("Compression");
5959

6060
this.mockFixture.ProcessManager.OnCreateProcess = (command, arguments, workingDir) =>
6161
{

‎src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchClientProfileTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void SetupFixture()
3737

3838
DeathStarBenchExecutor.StateConfirmationPollingTimeout = TimeSpan.FromSeconds(1);
3939

40-
this.mockFixture.SetupWorkloadPackage("deathstarbench");
40+
this.mockFixture.SetupPackage("deathstarbench");
4141
this.mockFixture.SetupFile(@"/usr/local/bin/docker-compose");
4242
}
4343

@@ -92,7 +92,7 @@ public async Task DeathStarBenchWorkloadProfileExecutesTheWorkloadAsExpectedOfCl
9292
@"linux-x64/hotelreservation/wrk2/results.txt",
9393
};
9494

95-
this.mockFixture.SetupWorkloadPackage("deathstarbench", expectedFiles: expectedFiles);
95+
this.mockFixture.SetupPackage("deathstarbench", expectedFiles: expectedFiles);
9696
this.mockFixture.SetupFile("deathstarbench/linux-x64/socialnetwork/wrk2", "results.txt", TestDependencies.GetResourceFileContents("Results_DeathStarBench.txt"));
9797
this.mockFixture.SetupFile(@"/usr/local/bin/docker-compose");
9898

‎src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchServerProfileTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public async Task DeathStarBenchWorkloadProfileExecutesTheWorkloadAsExpectedOfSe
8888
@"linux-x64/hotelreservation/wrk2",
8989
};
9090

91-
this.mockFixture.SetupWorkloadPackage("deathstarbench", expectedFiles: expectedFiles);
91+
this.mockFixture.SetupPackage("deathstarbench", expectedFiles: expectedFiles);
9292
this.mockFixture.SetupFile(@"/usr/local/bin/docker-compose");
9393

9494
this.mockFixture.ProcessManager.OnCreateProcess = (command, arguments, workingDir) =>

‎src/VirtualClient/VirtualClient.Actions.FunctionalTests/DiskSpdProfileTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public async Task DiskSpdWorkloadProfileExecutesTheExpectedWorkloadsOnWindowsPla
7474
// - The workload generates valid results.
7575
this.mockFixture.Setup(PlatformID.Win32NT);
7676
this.mockFixture.SetupDisks(withUnformatted: false);
77-
this.mockFixture.SetupWorkloadPackage("diskspd", expectedFiles: $@"win-x64\diskspd.exe");
77+
this.mockFixture.SetupPackage("diskspd", expectedFiles: $@"win-x64\diskspd.exe");
7878

7979
this.mockFixture.ProcessManager.OnCreateProcess = (command, arguments, workingDir) =>
8080
{

‎src/VirtualClient/VirtualClient.Actions.FunctionalTests/FioDiscoveryProfileTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public async Task FioDiscoveryWorkloadProfileExecutesTheExpectedWorkloadsOnUnixP
7878
// - The workload generates valid results.
7979
this.mockFixture.Setup(PlatformID.Unix);
8080
this.mockFixture.SetupDisks(withUnformatted: false);
81-
this.mockFixture.SetupWorkloadPackage("fio", expectedFiles: $@"linux-x64/fio");
81+
this.mockFixture.SetupPackage("fio", expectedFiles: $@"linux-x64/fio");
8282

8383
this.mockFixture.ProcessManager.OnCreateProcess = (command, arguments, workingDir) =>
8484
{

‎src/VirtualClient/VirtualClient.Actions.FunctionalTests/FioMultiThroughputProfileTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public async Task FioWorkloadMultiThroughputProfileExecutesTheExpectedWorkloadsO
8080
// - The workload generates valid results.
8181
this.mockFixture.Setup(PlatformID.Unix);
8282
this.mockFixture.SetupDisks(withUnformatted: false);
83-
this.mockFixture.SetupWorkloadPackage("fio", expectedFiles: $@"linux-x64/fio");
83+
this.mockFixture.SetupPackage("fio", expectedFiles: $@"linux-x64/fio");
8484
string jobFilePath = this.mockFixture.PlatformSpecifics.Combine(this.mockFixture.ScriptsDirectory, "fio/oltp-c.fio.jobfile");
8585
this.mockFixture.SetupFile(jobFilePath, Encoding.ASCII.GetBytes(TestDependencies.GetResourceFileContents("oltp-c.fio.jobfile")));
8686

‎src/VirtualClient/VirtualClient.Actions.FunctionalTests/FioProfileTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public async Task FioWorkloadProfileExecutesTheExpectedWorkloadsOnWindowsPlatfor
103103
// - The workload generates valid results.
104104
this.mockFixture.Setup(PlatformID.Win32NT);
105105
this.mockFixture.SetupDisks(withUnformatted: false);
106-
this.mockFixture.SetupWorkloadPackage("fio", expectedFiles: $@"win-x64\fio.exe");
106+
this.mockFixture.SetupPackage("fio", expectedFiles: $@"win-x64\fio.exe");
107107

108108
this.mockFixture.ProcessManager.OnCreateProcess = (command, arguments, workingDir) =>
109109
{
@@ -137,7 +137,7 @@ public async Task FioWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatform(s
137137
// - The workload generates valid results.
138138
this.mockFixture.Setup(PlatformID.Unix);
139139
this.mockFixture.SetupDisks(withUnformatted: false);
140-
this.mockFixture.SetupWorkloadPackage("fio", expectedFiles: $@"linux-x64/fio");
140+
this.mockFixture.SetupPackage("fio", expectedFiles: $@"linux-x64/fio");
141141

142142
this.mockFixture.ProcessManager.OnCreateProcess = (command, arguments, workingDir) =>
143143
{

0 commit comments

Comments
 (0)