Skip to content

Fixing some piping issue. https://github.com/Azure/azure-powershell/issues/2996 #3101

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
merged 5 commits into from
Oct 26, 2016
Merged

Fixing some piping issue. https://github.com/Azure/azure-powershell/issues/2996 #3101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d84ee5e
Fixing some piping issue.
diwudd Oct 19, 2016
8e34d95
Adding Scenario tests for Remove Cmdlets.
diwudd Oct 21, 2016
f7e7575
Copying session records files.
diwudd Oct 21, 2016
485f5ab
Fixing some comments.
diwudd Oct 24, 2016
eb8ebaf
Updating some json files properties.
diwudd Oct 24, 2016
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
5 changes: 5 additions & 0 deletions ...s/Commands.ResourceManager/Cmdlets/Implementation/CmdletBase/ResourceManagerCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,11 @@ public override void ExecuteCmdlet()
{
try
{
if (this.cancellationSource == null)
{
this.cancellationSource = new CancellationTokenSource();
}

base.ExecuteCmdlet();
this.OnProcessRecord();
}
Expand Down
6 changes: 6 additions & 0 deletions src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,12 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestMoveResourceFailed.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestRemoveAResourceTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestRemoveASetOfResourcesTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestSetAResourceTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
14 changes: 14 additions & 0 deletions src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,5 +139,19 @@ public void TestManageResourceWithZones()
{
ResourcesController.NewInstance.RunPsTest("Test-ManageResourceWithZones");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestRemoveAResourceTest()
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the change covered by these two test cases?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the scenario test I added and recorded.

{
ResourcesController.NewInstance.RunPsTest("Test-RemoveAResource");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestRemoveASetOfResourcesTest()
{
ResourcesController.NewInstance.RunPsTest("Test-RemoveASetOfResources");
}
}
}
59 changes: 59 additions & 0 deletions src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,4 +445,63 @@ function Test-ManageResourceWithZones
Assert-NotNull $resourceGet
Assert-AreEqual $resourceGet.Zones.Length 1
Assert-AreEqual $resourceGet.Zones[0] "3"
}

<#
.SYNOPSIS
Tests removing a resource.
#>
function Test-RemoveAResource
{
# Setup
$rgname = Get-ResourceGroupName
$rname = "testname"
$rglocation = Get-ProviderLocation ResourceManagement
$apiversion = "2014-04-01"
$resourceType = "Providers.Test/statefulResources"

# Test
New-AzureRmResourceGroup -Name $rgname -Location $rglocation
$actual = New-AzureRmResource -Name $rname -Location $rglocation -Tags @{testtag = "testval"} -ResourceGroupName $rgname -ResourceType $resourceType -PropertyObject @{"key" = "value"} -SkuObject @{ Name = "A0" } -ApiVersion $apiversion -Force
$expected = Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname
Assert-NotNull $expected
Assert-AreEqual $actual.ResourceId $expected[0].ResourceId

Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname | Remove-AzureRmResource -Force
$expected = Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname
Assert-Null $expected
}

<#
.SYNOPSIS
Tests removing a set of resources.
#>
function Test-RemoveASetOfResources
{
# Setup
$rgname = Get-ResourceGroupName
$rname = "testname"
$rname2 = "test2name"
$rglocation = Get-ProviderLocation ResourceManagement
$apiversion = "2014-04-01"
$resourceType = "Providers.Test/statefulResources"

# Test
New-AzureRmResourceGroup -Name $rgname -Location $rglocation
$actual = New-AzureRmResource -Name $rname -Location $rglocation -Tags @{testtag = "testval"} -ResourceGroupName $rgname -ResourceType $resourceType -PropertyObject @{"key" = "value"} -SkuObject @{ Name = "A0" } -ApiVersion $apiversion -Force
$expected = Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname
Assert-NotNull $expected
Assert-AreEqual $actual.ResourceId $expected[0].ResourceId

$expected = Find-AzureRmResource -ResourceType $resourceType -ResourceGroupNameContains $rgName
Assert-NotNull $expected
Assert-AreEqual $actual.ResourceId $expected[0].ResourceId

New-AzureRmResource -Name $rname2 -Location $rglocation -Tags @{testtag = "testval"} -ResourceGroupName $rgname -ResourceType $resourceType -PropertyObject @{"key" = "value"} -SkuObject @{ Name = "A0" } -ApiVersion $apiversion -Force
$expected = Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname
Assert-AreEqual 2 @($expected).Count

Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname | Remove-AzureRmResource -Force
$expected = Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname
Assert-Null $expected
}
Loading