Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merging

  • Loading branch information...
commit 5cc48a85ef000de8a950a1ff49773937f17c500a 2 parents 1d1abd2 + 66b09f8
markcowl authored
View
11 WindowsAzurePowershell/src/Management.ScenarioTest/Resources/CloudService/Common.ps1
@@ -101,12 +101,11 @@ Removes all cloud services/storage accounts in the current subscription.
#>
function Initialize-CloudServiceTest
{
-
- <# To Do: implement when we have unsigned version from Management.ServiceManagement assembly #>
- $global:createdCloudServices = @()
- Get-AzureStorageAccount | Remove-AzureStorageAccount
- Get-AzureService | Remove-AzureService -Force
-
+ try { Get-AzureStorageAccount | Remove-AzureStorageAccount }
+ catch { <# Proceed #> }
+
+ try { Get-AzureService | Remove-AzureService -Force }
+ catch { <# Proceed #> }
}
<#
View
43 WindowsAzurePowershell/src/Scenario.testsettings
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestSettings name="Scenario" id="be8eaf83-f542-4927-b5a8-d3b48b22a87d" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
- <Description>These are default test settings for a scenario test run.</Description>
- <Deployment>
- <DeploymentItem filename="Management.ServiceBus\Microsoft.WindowsAzure.Management.ServiceBus.format.ps1xml" />
- <DeploymentItem filename="Management.ServiceBus.Test\Resources\" />
- <DeploymentItem filename="Management.WebSites\Microsoft.WindowsAzure.Management.WebSites.format.ps1xml" />
- <DeploymentItem filename="Management.WebSites\Microsoft.WindowsAzure.Management.WebSites.Types.ps1xml" />
- <DeploymentItem filename="Management.CloudService.Test\Resources\" />
- <DeploymentItem filename="Management.ServiceManagement.Test\VhdFiles\" />
- <DeploymentItem filename="Management.ServiceManagement.Test\Resources\" />
- <DeploymentItem filename="Management.CloudService\Resources\" />
- <DeploymentItem filename="Management.Test\Resources\" />
- <DeploymentItem filename="Management.ScenarioTest\Resources\" />
- <DeploymentItem filename="..\..\Package\Debug\" />
- <DeploymentItem filename="Management.CloudService\Microsoft.WindowsAzure.Management.CloudService.format.ps1xml" />
- </Deployment>
- <Execution>
- <TestTypeSpecific>
- <UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
- <AssemblyResolution>
- <TestDirectory useLoadContext="true" />
- </AssemblyResolution>
- </UnitTestRunConfig>
- <WebTestRunConfiguration testTypeId="4e7599fa-5ecb-43e9-a887-cd63cf72d207">
- <Browser name="Internet Explorer 7.0">
- <Headers>
- <Header name="User-Agent" value="Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)" />
- <Header name="Accept" value="*/*" />
- <Header name="Accept-Language" value="{{$IEAcceptLanguage}}" />
- <Header name="Accept-Encoding" value="GZIP" />
- </Headers>
- </Browser>
- </WebTestRunConfiguration>
- </TestTypeSpecific>
- <AgentRule name="LocalMachineDefaultRole">
- <DataCollectors>
- <DataCollector uri="datacollector://microsoft/CodeCoverage/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TestTools.CodeCoverage.CoveragePlugIn, Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Code Coverage (Visual Studio 2010)">
- </DataCollector>
- </DataCollectors>
- </AgentRule>
- </Execution>
-</TestSettings>
Please sign in to comment.
Something went wrong with that request. Please try again.