Skip to content

Commit 6cf348b

Browse files
huangpfhuangpf
committed
Merge branch 'dev' of https://github.com/AzureRT/azure-powershell into dev
Conflicts: src/Common/Commands.ScenarioTest/ServiceManagement/GetVMTests.cs src/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.AzureVMTests/TestGetAzureVM.json
2 parents 910e4ed + bc99988 commit 6cf348b

File tree

24 files changed

+484
-350
lines changed

24 files changed

+484
-350
lines changed

‎AzurePowershell.Test.targets

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,16 @@
393393
ContinueOnError="false" />
394394
</Target>
395395

396+
<Target Name="ComputeCodeCoverage" DependsOnTargets="ForceRestorePackages;Clean;BuildDebug">
397+
<Message Importance="high" Text="Gathering Code Coverage data from Compute tests..." />
398+
<Delete Files="Project.covarage" />
399+
<Exec
400+
Command="pushd .\src\ResourceManager\Compute\Commands.Compute.Test\
401+
.\ComputeCodeCoverage.cmd
402+
popd"
403+
ContinueOnError="false" />
404+
</Target>
405+
396406
<!-- DSC extension related targets -->
397407
<Target Name="TestDSCExtension_x64">
398408
<Message Importance="high" Text="Running DSC extension BVT x64 tests..." />

‎src/Common/Commands.ScenarioTest/AutomationTests/AutomationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected void RunPowerShellTest(params string[] scripts)
100100
modules.Add("Common.ps1");
101101

102102
helper.SetupEnvironment(AzureModule.AzureServiceManagement);
103-
helper.SetupModules(AzureModule.AzureServiceManagement, modules.ToArray());
103+
helper.SetupModulesFromCommon(AzureModule.AzureServiceManagement, modules.ToArray());
104104

105105
helper.RunPowerShellTest(scripts);
106106
}

‎src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -183,25 +183,25 @@
183183
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
184184
</None>
185185
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.AutomationTests\TestAutomationConfigureRunbook.json">
186-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
186+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
187187
</None>
188188
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.AutomationTests\TestAutomationPublishAndEditRunbook.json">
189-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
189+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
190190
</None>
191191
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.AutomationTests\TestAutomationRunbookWithParameter.json">
192-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
192+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
193193
</None>
194194
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.AutomationTests\TestAutomationStartAndStopRunbook.json">
195-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
195+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
196196
</None>
197197
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.AutomationTests\TestAutomationStartRunbookOnASchedule.json">
198-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
198+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
199199
</None>
200200
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.AutomationTests\TestAutomationStartUnpublishedRunbook.json">
201-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
201+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
202202
</None>
203203
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.AutomationTests\TestAutomationSuspendAndResumeJob.json">
204-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
204+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
205205
</None>
206206
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.AzureVMTests\TestGetAzureLocation.json">
207207
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -210,70 +210,70 @@
210210
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
211211
</None>
212212
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.SchedulerTests\TestSchedulerEndToEnd.json">
213-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
213+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
214214
</None>
215215
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestAddAzureTrafficManagerEndpoint.json">
216-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
216+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
217217
</None>
218218
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestAddAzureTrafficManagerEndpointNoWeightLocation.json">
219-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
219+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
220220
</None>
221221
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestAddMultipleAzureTrafficManagerEndpoint.json">
222-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
222+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
223223
</None>
224224
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestCreateAndRemoveProfile.json">
225-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
225+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
226226
</None>
227227
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestDisableProfile.json">
228-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
228+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
229229
</None>
230230
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestDisableProfileWithInvalidCredentials.json">
231-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
231+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
232232
</None>
233233
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestEnableProfile.json">
234-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
234+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
235235
</None>
236236
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestEnableProfileWithInvalidCredentials.json">
237-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
237+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
238238
</None>
239239
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestGetMultipleProfiles.json">
240-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
240+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
241241
</None>
242242
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestGetProfile.json">
243-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
243+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
244244
</None>
245245
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestGetProfileWithInvalidCredentials.json">
246-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
246+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
247247
</None>
248248
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestNewProfile.json">
249-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
249+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
250250
</None>
251251
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestNewProfileInvalidParameters.json">
252-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
252+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
253253
</None>
254254
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestRemoveAzureTrafficManagerEndpoint.json">
255-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
255+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
256256
</None>
257257
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestRemoveProfileWithInvalidCredentials.json">
258-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
258+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
259259
</None>
260260
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestRemoveProfileWithNonExistingName.json">
261-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
261+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
262262
</None>
263263
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestSetAzureTrafficManagerEndpoint.json">
264-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
264+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
265265
</None>
266266
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestSetAzureTrafficManagerEndpointAdds.json">
267-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
267+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
268268
</None>
269269
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestSetAzureTrafficManagerEndpointUpdateWeightLocation.json">
270-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
270+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
271271
</None>
272272
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestSetProfileProperty.json">
273-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
273+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
274274
</None>
275275
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.TrafficManagerTests\TestTestAzureTrafficManagerDomainName.json">
276-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
276+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
277277
</None>
278278
<None Include="Resources\Storage\StorageContext.ps1">
279279
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎src/Common/Commands.ScenarioTest/ServiceManagement/GetVMTests.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ public partial class AzureVMTests
2828
#region Get-AzureVM Scenario Tests
2929

3030
[Fact]
31-
[Trait(Category.Service, Category.ServiceManagement)]
32-
[Trait(Category.AcceptanceType, Category.LiveOnly)]
33-
[Trait(Category.AcceptanceType, Category.BVT)]
31+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3432
public void TestGetAzureVM()
3533
{
3634
this.RunPowerShellTest("Test-GetAzureVM");

‎src/Common/Commands.ScenarioTest/WebsitesTests/WebsitesTestsBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected void RunPowerShellTest(params string[] scripts)
5252
SetupManagementClients();
5353

5454
helper.SetupEnvironment(AzureModule.AzureServiceManagement);
55-
helper.SetupModules(AzureModule.AzureServiceManagement,
55+
helper.SetupModulesFromCommon(AzureModule.AzureServiceManagement,
5656
"Resources\\Websites\\Common.ps1",
5757
"Resources\\Websites\\" + this.GetType().Name + ".ps1");
5858

‎src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public class EnvironmentSetupHelper
3939

4040
private AzureAccount testAccount;
4141

42+
private const string PackageDirectoryFromCommon = @"..\..\..\..\Package\Debug";
4243
private const string PackageDirectory = @"..\..\..\..\..\Package\Debug";
4344

4445
protected List<string> modules;
@@ -228,6 +229,31 @@ public void SetupModules(AzureModule mode, params string[] modules)
228229
this.modules.AddRange(modules);
229230
}
230231

232+
public void SetupModulesFromCommon(AzureModule mode, params string[] modules)
233+
{
234+
this.modules = new List<string>();
235+
if (mode == AzureModule.AzureProfile)
236+
{
237+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1"));
238+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"));
239+
}
240+
else if (mode == AzureModule.AzureServiceManagement)
241+
{
242+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1"));
243+
}
244+
else if (mode == AzureModule.AzureResourceManager)
245+
{
246+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"));
247+
}
248+
else
249+
{
250+
throw new ArgumentException("Unknown command type for testing");
251+
}
252+
this.modules.Add("Assert.ps1");
253+
this.modules.Add("Common.ps1");
254+
this.modules.AddRange(modules);
255+
}
256+
231257
public void SetupModules(params string[] modules)
232258
{
233259
this.modules = new List<string>();

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,22 +167,22 @@
167167
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
168168
</None>
169169
<None Include="SessionRecords\Microsoft.Azure.Commands.ApiManagement.Test.ScenarioTests.ApiManagementTests\TestBackupRestoreApiManagement.json">
170-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
170+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
171171
</None>
172172
<None Include="SessionRecords\Microsoft.Azure.Commands.ApiManagement.Test.ScenarioTests.ApiManagementTests\TestCrudApiManagement.json">
173-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
173+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
174174
</None>
175175
<None Include="SessionRecords\Microsoft.Azure.Commands.ApiManagement.Test.ScenarioTests.ApiManagementTests\TestImportApiManagementHostnameCertificate.json">
176-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
176+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
177177
</None>
178178
<None Include="SessionRecords\Microsoft.Azure.Commands.ApiManagement.Test.ScenarioTests.ApiManagementTests\TestSetApiManagementVirtualNetworks.json">
179-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
179+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
180180
</None>
181181
<None Include="SessionRecords\Microsoft.Azure.Commands.ApiManagement.Test.ScenarioTests.ApiManagementTests\TestUpdateApiManagementDeployment.json">
182-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
182+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
183183
</None>
184184
<None Include="SessionRecords\Microsoft.Azure.Commands.ApiManagement.Test.ScenarioTests.ApiManagementTests\TestUpdateDeploymentComplex.json">
185-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
185+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
186186
</None>
187187
<None Include="testcertificate.pfx">
188188
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

0 commit comments

Comments
 (0)