Skip to content

Commit eeaef45

Browse files
[Android] Remove gRPC client tests (#121953)
This PR reverts changes from #73060 The Android gRPC pipeline has been failing for a while and does not currently serve any purpose. We need to revisit the need for this test. For the time being, let's remove this code from the repo. /cc @tommcdon
1 parent 80f1fae commit eeaef45

35 files changed

+5
-2179
lines changed

.config/CredScanSuppressions.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,12 @@
77
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/DSA/DSAKeyPemTests.cs",
88
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyPemTests.cs",
99
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs",
10-
"src/libraries/Common/tests/System/Security/Cryptography/X509Certificates/TestData.cs",
11-
"src/tests/FunctionalTests/Android/Device_Emulator/gRPC/grpc-dotnet/testassets/Certs/InteropTests/server1.key"
10+
"src/libraries/Common/tests/System/Security/Cryptography/X509Certificates/TestData.cs"
1211
],
1312
"placeholder": [
1413
"-----BEGIN PRIVATE KEY-----",
1514
"-----BEGIN * PRIVATE KEY-----"
1615
]
17-
},
18-
{
19-
"_justification": "Suppression approved. Private key for testing purpose.",
20-
"file": [
21-
"src/tests/FunctionalTests/Android/Device_Emulator/gRPC/grpc-dotnet/testassets/Certs/InteropTests/server1.pfx"
22-
]
2316
}
2417
]
2518
}

eng/Versions.props

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,6 @@
135135
<AwesomeAssertionsVersion>8.0.2</AwesomeAssertionsVersion>
136136
<FsCheckVersion>2.14.3</FsCheckVersion>
137137
<CommandLineParserVersion>2.9.1</CommandLineParserVersion>
138-
<!-- Android gRPC client tests -->
139-
<GoogleProtobufVersion>3.19.4</GoogleProtobufVersion>
140-
<GrpcAspNetCoreVersion>2.46.0</GrpcAspNetCoreVersion>
141-
<GrpcAspNetCoreWebVersion>2.46.0</GrpcAspNetCoreWebVersion>
142-
<GrpcAuthVersion>2.46.3</GrpcAuthVersion>
143-
<GrpcCoreVersion>2.46.3</GrpcCoreVersion>
144-
<GrpcDotnetClientVersion>2.45.0</GrpcDotnetClientVersion>
145-
<GrpcToolsVersion>2.45.0</GrpcToolsVersion>
146138
<CompilerPlatformTestingVersion>1.1.3-beta1.24423.1</CompilerPlatformTestingVersion>
147139
<CompilerPlatformTestingDiffPlexVersion>1.7.2</CompilerPlatformTestingDiffPlexVersion>
148140
<CompilerPlatformTestingMicrosoftVisualBasicVersion>10.2.0</CompilerPlatformTestingMicrosoftVisualBasicVersion>

eng/liveBuilds.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<ToolsILLinkDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ILLink.Tasks', '$(ToolsConfiguration)'))</ToolsILLinkDir>
3838

3939
<MonoAotCrossDir>$([MSBuild]::NormalizeDirectory('$(MonoArtifactsPath)', 'cross', $(TargetOS)-$(TargetArchitecture.ToLowerInvariant())))</MonoAotCrossDir>
40-
<GrpcServerDockerImageDir>$([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'obj', 'grpcserver', 'docker'))</GrpcServerDockerImageDir>
4140

4241
<LibrariesPackagesDir>$([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'packages', '$(LibrariesConfiguration)'))</LibrariesPackagesDir>
4342
<LibrariesShippingPackagesDir>$([MSBuild]::NormalizeDirectory('$(LibrariesPackagesDir)', 'Shipping'))</LibrariesShippingPackagesDir>

eng/pipelines/runtime-android-grpc-client-tests.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/libraries/sendtohelixhelp.proj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,6 @@
175175
<HelixProperties Condition="'$(Scenario)' != ''" Include="scenario" Value="$(Scenario)" />
176176
</ItemGroup>
177177

178-
<ItemGroup Condition="'$(RunGrpcTestsOnly)' == 'true' and '$(BuildGrpcServerDockerImage)' == 'true'">
179-
<HelixCorrelationPayload Include="$(GrpcServerDockerImageDir)" Destination="grpcserver" />
180-
<HelixPreCommand Include="docker load -i $HELIX_CORRELATION_PAYLOAD/grpcserver/grpcserver.tar" />
181-
<HelixPreCommand Include="docker run --name grpc-server -d -p 50052:50052 -p 80:80 grpc-server:latest" />
182-
<HelixPostCommand Include="docker stop grpc-server" />
183-
<HelixPostCommand Include="docker rmi -f grpc-server:latest" />
184-
</ItemGroup>
185-
186178
<!-- Ensure that all HelixPreCommand items are ready before this -->
187179
<Target Name="BuildHelixCommand">
188180
<!-- setting DotNetCliVersion here to ensure that it is set to the intended value -->

src/libraries/tests.proj

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@
192192
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.IO.FileSystem.Tests\System.IO.FileSystem.Tests.csproj" />
193193
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.Ports\tests\System.IO.Ports.Tests.csproj" />
194194
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Security\tests\FunctionalTests\System.Net.Security.Tests.csproj" />
195-
<!-- gRPC tests should be run only manually -->
196-
<ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\gRPC\Android.Device_Emulator.gRPC.Test.csproj" />
197195
</ItemGroup>
198196

199197
<ItemGroup Condition="('$(TargetOS)' == 'android' or '$(TargetsLinuxBionic)' == 'true') and '$(TargetArchitecture)' == 'arm' and '$(RunDisabledAndroidTests)' != 'true'">
@@ -533,7 +531,6 @@
533531

534532
<ItemGroup>
535533
<SmokeTestProject Condition="'$(UseNativeAOTRuntime)' != 'true'" Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests\System.Runtime.Tests.csproj" />
536-
<GrpcTestProject Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\gRPC\Android.Device_Emulator.gRPC.Test.csproj" />
537534
</ItemGroup>
538535

539536
<!-- browser smoke tests -->
@@ -659,12 +656,9 @@
659656
<ProjectReference Condition="'$(RunHighAOTResourceRequiringTestsOnly)' == 'true'"
660657
Include="@(HighAOTResourceRequiringProject)"
661658
BuildInParallel="false" />
662-
<ProjectReference Condition="'$(RunGrpcTestsOnly)' == 'true'"
663-
Include="@(GrpcTestProject)" />
664659
</ItemGroup>
665660

666661
<ItemGroup Condition="'$(RunSmokeTestsOnly)' != 'true'
667-
and '$(RunGrpcTestsOnly)' != 'true'
668662
and '$(RunHighAOTResourceRequiringTestsOnly)' != 'true'
669663
and '$(RunLimitedSetOfTests)' != 'true'">
670664

@@ -719,25 +713,25 @@
719713
<ProjectReference Include="$(MSBuildThisFileDirectory)System.IO.Hashing\tests\System.IO.Hashing.Tests.csproj" />
720714
</ItemGroup>
721715

722-
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(RunSmokeTestsOnly)' != 'true' and '$(RunGrpcTestsOnly)' != 'true' and '$(TargetOS)' == 'iossimulator' and '$(RuntimeFlavor)' == 'Mono'">
716+
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(RunSmokeTestsOnly)' != 'true' and '$(TargetOS)' == 'iossimulator' and '$(RuntimeFlavor)' == 'Mono'">
723717
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\**\*.Test.csproj"
724718
Exclude="@(ProjectExclusions)"
725719
BuildInParallel="false" />
726720
</ItemGroup>
727721

728-
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(RunSmokeTestsOnly)' != 'true' and '$(RunGrpcTestsOnly)' != 'true' and '$(TargetOS)' == 'tvos'">
722+
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(RunSmokeTestsOnly)' != 'true' and '$(TargetOS)' == 'tvos'">
729723
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\tvOS\Device\**\*.Test.csproj"
730724
Exclude="@(ProjectExclusions)"
731725
BuildInParallel="false" />
732726
</ItemGroup>
733727

734-
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(RunSmokeTestsOnly)' != 'true' and '$(RunGrpcTestsOnly)' != 'true' and '$(TargetOS)' == 'maccatalyst'">
728+
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(RunSmokeTestsOnly)' != 'true' and '$(TargetOS)' == 'maccatalyst'">
735729
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\**\*.Test.csproj"
736730
Exclude="@(ProjectExclusions)"
737731
BuildInParallel="false" />
738732
</ItemGroup>
739733

740-
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(RunSmokeTestsOnly)' != 'true' and '$(RunGrpcTestsOnly)' != 'true' and '$(TargetOS)' == 'tvossimulator'">
734+
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(RunSmokeTestsOnly)' != 'true' and '$(TargetOS)' == 'tvossimulator'">
741735
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\tvOS\Simulator\**\*.Test.csproj"
742736
Exclude="@(ProjectExclusions)"
743737
BuildInParallel="false" />

src/tests/FunctionalTests/Android/Device_Emulator/gRPC/Android.Device_Emulator.gRPC.Test.csproj

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/tests/FunctionalTests/Android/Device_Emulator/gRPC/Program.cs

Lines changed: 0 additions & 91 deletions
This file was deleted.

src/tests/FunctionalTests/Android/Device_Emulator/gRPC/README.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/tests/FunctionalTests/Android/Device_Emulator/gRPC/THIRD-PARTY-NOTICES

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)