Skip to content

Commit d223c84

Browse files
markcowlmarkcowl
committed
Merge pull request #91 from AzureRT/dev
Azure RT PR for Sprint 44
2 parents 0a2f33d + a35aa6f commit d223c84

32 files changed

+588
-1631
lines changed

‎AzurePowershell.Test.targets

Lines changed: 55 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222
<HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
2323
<StorageTestDebug>.\src\ServiceManagement\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
2424
<KeyVaultTestDebug>.\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll</KeyVaultTestDebug>
25-
<TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain"</TestFilter>
25+
<TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain&#x26;!Network&#x26;!AzureRTUpload"</TestFilter>
2626
<ScenarioTestFilter>All</ScenarioTestFilter>
2727
<OneSDKCITFilter>"OneSDK&#x26;CIT"</OneSDKCITFilter>
28-
<AzureRTAllTestFilter>"Functional|AzureRTScenario"</AzureRTAllTestFilter>
29-
<AzureRTAllTestFilter2>"Functional|AzureRTScenario|Preview"</AzureRTAllTestFilter2>
30-
<AzureRTAllTestFilter3>"Functional|AzureRTScenario|Sequential"</AzureRTAllTestFilter3>
28+
<AzureRTAllTestFilter>"Functional|AzureRTScenario|Sequential|AzureRTUpload|Network"</AzureRTAllTestFilter>
29+
<AzureRTParAllFilter>"Functional|AzureRTScenario"</AzureRTParAllFilter>
30+
<AzureRTAllPreviewFilter>"Functional|AzureRTScenario|Preview"</AzureRTAllPreviewFilter>
31+
<AzureRTUploadSeqFilter>"AzureRTUpload|Sequential"</AzureRTUploadSeqFilter>
32+
<AzureRTSeqAllFilter>"AzureRTUpload|Sequential|Network"</AzureRTSeqAllFilter>
3133
</PropertyGroup>
3234

3335
<Target Name="InvokeMSTest">
@@ -194,6 +196,14 @@
194196
ContinueOnError="false" />
195197
</Target>
196198

199+
<Target Name="AzureRTRepeat" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
200+
<Message Importance="high" Text="Running a specific tests..." />
201+
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
202+
<Exec
203+
Command="for /l %%x in (1, 1, $(RepeatTimes)) do MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /test:$(TestName) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug%%x.trx"
204+
ContinueOnError="false" />
205+
</Target>
206+
197207
<Target Name="AzureRTMulti" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
198208
<Message Importance="high" Text="Running tests:" />
199209
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
@@ -206,7 +216,7 @@
206216
<Message Importance="high" Text="Running AzureRT all tests..." />
207217
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
208218
<Exec
209-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTAllTestFilter3) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
219+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTAllTestFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
210220
ContinueOnError="false" />
211221
</Target>
212222

@@ -216,33 +226,67 @@
216226
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
217227
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
218228
<Exec
219-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:Sequential /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
229+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTSeqAllFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
220230
ContinueOnError="true" />
221231
<Exec
222-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTAllTestFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
232+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTParAllFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
223233
ContinueOnError="false" />
224234
</Target>
225235

226236
<Target Name="AzureRTSeq" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
227237
<Message Importance="high" Text="Running AzureRT all tests..." />
228238

229239
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
230-
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
231240
<Exec
232-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:Sequential /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
241+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTSeqAllFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
233242
ContinueOnError="true" />
234243
</Target>
235244

236-
<Target Name="AzureRTPar" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
245+
<Target Name="AzureRTNetwork" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
237246
<Message Importance="high" Text="Running AzureRT all tests..." />
238247

239248
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
249+
<Exec
250+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:Network /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
251+
ContinueOnError="false" />
252+
</Target>
253+
254+
<Target Name="AzureRTUploadSeq" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
255+
<Message Importance="high" Text="Running AzureRT all tests..." />
256+
257+
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
258+
<Exec
259+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTUploadSeqFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
260+
ContinueOnError="false" />
261+
</Target>
262+
263+
<Target Name="AzureRTPar" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
264+
<Message Importance="high" Text="Running AzureRT all tests..." />
265+
240266
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
241267
<Exec
242268
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTAllTestFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
243269
ContinueOnError="false" />
244270
</Target>
245271

272+
<Target Name="AzureRTFuntional" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
273+
<Message Importance="high" Text="Running AzureRT Funtional tests..." />
274+
275+
<Delete Files="$(TestOutputDirectory)\RTFuntionalDebug.trx" />
276+
<Exec
277+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:Functional /resultsfile:$(TestOutputDirectory)\RTFuntionalDebug.trx"
278+
ContinueOnError="false" />
279+
</Target>
280+
281+
<Target Name="AzureRTScenario" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
282+
<Message Importance="high" Text="Running AzureRT Scenario tests..." />
283+
284+
<Delete Files="$(TestOutputDirectory)\RTScenarioDebug.trx" />
285+
<Exec
286+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:AzureRTScenario /resultsfile:$(TestOutputDirectory)\RTScenarioDebug.trx"
287+
ContinueOnError="false" />
288+
</Target>
289+
246290
<Target Name="AzureRTAllPreview" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
247291
<Message Importance="high" Text="Running AzureRT all tests..." />
248292
<Delete Files="$(TestOutputDirectory)\RTAddVhdDebug.trx" />
@@ -251,7 +295,7 @@
251295
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:Sequential /resultsfile:$(TestOutputDirectory)\RTAddVhdDebug.trx"
252296
ContinueOnError="true" />
253297
<Exec
254-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTAllTestFilter2) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
298+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTAllPreviewFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
255299
ContinueOnError="false" />
256300
</Target>
257301

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@
191191
<Compile Include="FunctionalTests\ExtensionTests\CustomScriptExtensionTests.cs" />
192192
<Compile Include="FunctionalTests\ExtensionTests\DscExtensionTests.cs" />
193193
<Compile Include="FunctionalTests\FunctionalTestCommonVhd.cs" />
194-
<Compile Include="FunctionalTests\FunctionalTestCommonVM.cs" />
195194
<Compile Include="FunctionalTests\GenericIaaSExtensionTests.cs" />
196195
<Compile Include="FunctionalTests\IaasCmdletInfo\AddAzureCertificateCmdletInfo.cs" />
197196
<Compile Include="FunctionalTests\IaasCmdletInfo\AddAzureDiskCmdletInfo.cs" />
@@ -285,6 +284,9 @@
285284
<Compile Include="FunctionalTests\IaasCmdletInfo\RemoveAzureEndpointCmdletInfo.cs" />
286285
<Compile Include="FunctionalTests\IaasCmdletInfo\RemoveAzureStaticVNetIPCmdletInfo.cs" />
287286
<Compile Include="FunctionalTests\IaasCmdletInfo\AddAzureNetworkInterfaceConfigCmdletInfo.cs" />
287+
<Compile Include="FunctionalTests\NetworkCmdletInfo\GetAzureReservedIPCmdletInfo.cs" />
288+
<Compile Include="FunctionalTests\NetworkCmdletInfo\NewAzureReservedIPCmdletInfo.cs" />
289+
<Compile Include="FunctionalTests\NetworkCmdletInfo\RemoveAzureReservedIPCmdletInfo.cs" />
288290
<Compile Include="FunctionalTests\PaasCmdletInfo\GetAzureDeploymentEventBySlotCmdletInfo.cs" />
289291
<Compile Include="FunctionalTests\PaasCmdletInfo\GetAzureDeploymentEventCmdletInfo.cs" />
290292
<Compile Include="FunctionalTests\SubscriptionCmdletInfo\RemoveAzureSubscriptionCmdletInfo.cs" />
@@ -360,10 +362,6 @@
360362
<Compile Include="FunctionalTests\PIRTest.cs" />
361363
<Compile Include="FunctionalTests\PowershellCore\InvokeCommandCmdletInfo.cs" />
362364
<Compile Include="FunctionalTests\PowershellCore\PowershellCmdletScript.cs" />
363-
<Compile Include="FunctionalTests\PreviewCmdletInfo\GetAzureReservedIPCmdletInfo.cs" />
364-
<Compile Include="FunctionalTests\PreviewCmdletInfo\NewAzureReservedIPCmdletInfo.cs" />
365-
<Compile Include="FunctionalTests\PreviewCmdletInfo\RemoveAzureReservedIPCmdletInfo.cs" />
366-
<Compile Include="FunctionalTests\ReservedIPTest.cs" />
367365
<Compile Include="FunctionalTests\SaveAzureVhdTest.cs" />
368366
<Compile Include="FunctionalTests\ScenarioTest.cs" />
369367
<Compile Include="FunctionalTests\ServiceManagementCmdletTestHelper.cs">

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AddAzureVhdSASUriTest.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void Initialize()
5454
/// <summary>
5555
///
5656
/// </summary>
57-
[TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
57+
[TestMethod(), TestCategory(Category.Upload), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
5858
[DataSource("Microsoft.VisualStudio.TestTools.DataSource.CSV", "|DataDirectory|\\Resources\\upload_VHD.csv", "upload_VHD#csv", DataAccessMethod.Sequential)]
5959
public void UploadDiskSasUri()
6060
{
@@ -128,7 +128,7 @@ private string CreateSasUriWithPermission(string vhdName, int p)
128128
/// <summary>
129129
///
130130
/// </summary>
131-
[TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
131+
[TestMethod(), TestCategory(Category.Upload), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
132132
[DataSource("Microsoft.VisualStudio.TestTools.DataSource.CSV", "|DataDirectory|\\Resources\\overwrite_VHD.csv", "overwrite_VHD#csv", DataAccessMethod.Sequential)]
133133
public void UploadDiskOverwriteSasUri()
134134
{
@@ -187,7 +187,7 @@ public void UploadDiskOverwriteSasUri()
187187
/// <summary>
188188
///
189189
/// </summary>
190-
[TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
190+
[TestMethod(), TestCategory(Category.Upload), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
191191
[DataSource("Microsoft.VisualStudio.TestTools.DataSource.CSV", "|DataDirectory|\\Resources\\overwrite_VHD.csv", "overwrite_VHD#csv", DataAccessMethod.Sequential)]
192192
public void UploadDiskOverwriteNonExistSasUri()
193193
{
@@ -244,7 +244,7 @@ public void UploadDiskOverwriteNonExistSasUri()
244244
/// <summary>
245245
///
246246
/// </summary>
247-
[TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
247+
[TestMethod(), TestCategory(Category.Upload), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
248248
[DataSource("Microsoft.VisualStudio.TestTools.DataSource.CSV", "|DataDirectory|\\Resources\\overwrite_VHD.csv", "overwrite_VHD#csv", DataAccessMethod.Sequential)]
249249
public void UploadDiskSecondWithoutOverwriteSasUri()
250250
{
@@ -305,7 +305,7 @@ public void UploadDiskSecondWithoutOverwriteSasUri()
305305
/// <summary>
306306
///
307307
/// </summary>
308-
[TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
308+
[TestMethod(), TestCategory(Category.Upload), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
309309
[DataSource("Microsoft.VisualStudio.TestTools.DataSource.CSV", "|DataDirectory|\\Resources\\thread_VHD.csv", "thread_VHD#csv", DataAccessMethod.Sequential)]
310310
public void UploadDiskThreadNumberSasUri()
311311
{
@@ -361,7 +361,7 @@ public void UploadDiskThreadNumberSasUri()
361361
/// <summary>
362362
///
363363
/// </summary>
364-
[TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
364+
[TestMethod(), TestCategory(Category.Upload), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
365365
[DataSource("Microsoft.VisualStudio.TestTools.DataSource.CSV", "|DataDirectory|\\Resources\\thread_VHD.csv", "thread_VHD#csv", DataAccessMethod.Sequential)]
366366
public void UploadDiskThreadNumberOverwriteSasUri()
367367
{
@@ -414,7 +414,7 @@ public void UploadDiskThreadNumberOverwriteSasUri()
414414
/// <summary>
415415
///
416416
/// </summary>
417-
[TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
417+
[TestMethod(), TestCategory(Category.Upload), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
418418
[DataSource("Microsoft.VisualStudio.TestTools.DataSource.CSV", "|DataDirectory|\\Resources\\patch_VHD.csv", "patch_VHD#csv", DataAccessMethod.Sequential)]
419419
[Ignore] // BUG: https://github.com/Azure/azure-sdk-tools/issues/2956
420420
public void PatchFirstLevelDifferencingDiskSasUri()
@@ -543,7 +543,7 @@ public void PatchSasUriNormalBaseShouldFail()
543543
/// <summary>
544544
///
545545
/// </summary>
546-
[TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
546+
[TestMethod(), TestCategory(Category.Upload), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (Add-AzureVhd)")]
547547
[DataSource("Microsoft.VisualStudio.TestTools.DataSource.CSV", "|DataDirectory|\\Resources\\patch_VHD.csv", "patch_VHD#csv", DataAccessMethod.Sequential)]
548548
public void PatchNormalSasUriBase()
549549
{

0 commit comments

Comments
 (0)