Skip to content

Commit 0851fcd

Browse files
author
Ajit Navasare (MINDTREE LIMITED)
committed
Reivew comments updated
1 parent 9764f6e commit 0851fcd

File tree

9 files changed

+810
-863
lines changed

9 files changed

+810
-863
lines changed

src/ResourceManager/Relay/Commands.Relay.Test/Commands.Relay.Test.csproj

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929
<Prefer32Bit>false</Prefer32Bit>
3030
</PropertyGroup>
3131
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
32-
<SignAssembly>true</SignAssembly>
3332
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
34-
<DelaySign>true</DelaySign>
3533
<DebugType>pdbonly</DebugType>
3634
<Optimize>true</Optimize>
3735
<OutputPath>bin\Release\</OutputPath>
@@ -143,7 +141,7 @@
143141
</ItemGroup>
144142
<ItemGroup>
145143
<Compile Include="ScenarioTests\OperationsListTest.cs" />
146-
<Compile Include="ScenarioTests\CheckNameAvailabilityTests.cs" />
144+
<Compile Include="ScenarioTests\TestAzureRmRelayNameTests.cs" />
147145
<Compile Include="ScenarioTests\Namespace.cs" />
148146
<Compile Include="ScenarioTests\RelayController.cs" />
149147
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -159,11 +157,10 @@
159157
<None Include="packages.config">
160158
<SubType>Designer</SubType>
161159
</None>
162-
<None Include="ScenarioTests\Common.ps1" />
163160
<None Include="ScenarioTests\OperationsListTest.ps1">
164161
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
165162
</None>
166-
<None Include="ScenarioTests\CheckNameAvailabilityTests.ps1">
163+
<None Include="ScenarioTests\TestAzureRmRelayNameTests.ps1">
167164
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
168165
</None>
169166
<None Include="ScenarioTests\RelayNamespaceTests.ps1">
@@ -178,9 +175,6 @@
178175
<None Include="ScenarioTests\WcfRelayTests.ps1">
179176
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
180177
</None>
181-
<None Include="SessionRecords\Microsoft.Azure.Commands.Relay.Test.ScenarioTests.CheckNameAvailabilityTests\CheckNameAvailability.json">
182-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
183-
</None>
184178
<None Include="SessionRecords\Microsoft.Azure.Commands.Relay.Test.ScenarioTests.HybridConnectionsTests\HybridConnectionsAuthorizationRulesCRUD.json">
185179
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
186180
</None>
@@ -199,6 +193,9 @@
199193
<None Include="SessionRecords\Microsoft.Azure.Commands.Relay.Test.ScenarioTests.RelayNamespaceTests\RelayNamespaceCRUD.json">
200194
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
201195
</None>
196+
<None Include="SessionRecords\Microsoft.Azure.Commands.Relay.Test.ScenarioTests.TestAzureRmRelayNameTests\CheckNameAvailability.json">
197+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
198+
</None>
202199
<None Include="SessionRecords\Microsoft.Azure.Commands.Relay.Test.ScenarioTests.WcfRelayTests\WcfRelayAuthorizationRulesCRUD.json">
203200
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
204201
</None>

src/ResourceManager/Relay/Commands.Relay.Test/ScenarioTests/Common.ps1

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

src/ResourceManager/Relay/Commands.Relay.Test/ScenarioTests/RelayAuthorizationRulesTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,13 +360,13 @@ function RelayAuthTests
360360

361361
# Cleanup
362362
Write-Debug "Delete the created Namespace AuthorizationRule"
363-
$result = Remove-AzureRmRelayAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName
363+
$result = Remove-AzureRmRelayAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName -Force
364364

365365
Write-Debug "Delete the created WcfRelay AuthorizationRule"
366-
$result = Remove-AzureRmRelayAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -WcfRelay $wcfRelayName -Name $WcfRelayAuthRuleName
366+
$result = Remove-AzureRmRelayAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -WcfRelay $wcfRelayName -Name $WcfRelayAuthRuleName -Force
367367

368368
Write-Debug "Delete the created HybridConnection AuthorizationRule"
369-
$result = Remove-AzureRmRelayAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -HybridConnection $HybridConnectionsName -Name $HybirdConnectionAuthRuleName
369+
$result = Remove-AzureRmRelayAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -HybridConnection $HybridConnectionsName -Name $HybirdConnectionAuthRuleName -Force
370370

371371

372372
Write-Debug "Delete the WcfRelay"

src/ResourceManager/Relay/Commands.Relay.Test/ScenarioTests/CheckNameAvailabilityTests.cs renamed to src/ResourceManager/Relay/Commands.Relay.Test/ScenarioTests/TestAzureRmRelayNameTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ namespace Microsoft.Azure.Commands.Relay.Test.ScenarioTests
1919
using ServiceManagemenet.Common.Models;
2020
using Xunit;
2121
using Xunit.Abstractions;
22-
public class CheckNameAvailabilityTests : RMTestBase
22+
public class TestAzureRmRelayNameTests : RMTestBase
2323
{
24-
public CheckNameAvailabilityTests(ITestOutputHelper output)
24+
public TestAzureRmRelayNameTests(ITestOutputHelper output)
2525
{
2626
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2727
}
@@ -30,7 +30,7 @@ public CheckNameAvailabilityTests(ITestOutputHelper output)
3030
[Trait(Category.AcceptanceType, Category.CheckIn)]
3131
public void CheckNameAvailability()
3232
{
33-
RelayController.NewInstance.RunPsTest("CheckNameAvailabilityTests");
33+
RelayController.NewInstance.RunPsTest("TestAzureRmRelayNameTests");
3434
}
3535
}
3636
}

src/ResourceManager/Relay/Commands.Relay.Test/ScenarioTests/CheckNameAvailabilityTests.ps1 renamed to src/ResourceManager/Relay/Commands.Relay.Test/ScenarioTests/TestAzureRmRelayNameTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function Get-AuthorizationRuleName
5353
.SYNOPSIS
5454
Tests Relay Namespace CheckNameAvailability operations.
5555
#>
56-
function CheckNameAvailabilityTests
56+
function TestAzureRmRelayNameTests
5757
{
5858
# Setup
5959
$location = "West US"

src/ResourceManager/Relay/Commands.Relay.Test/SessionRecords/Microsoft.Azure.Commands.Relay.Test.ScenarioTests.CheckNameAvailabilityTests/CheckNameAvailability.json

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

0 commit comments

Comments
 (0)