Skip to content

Commit e9c320b

Browse files
jtlibingusjtlibingus
committed
Merge pull request #9 from Azure/dev
pull from dev branch of azure/azure-powershell
2 parents 2f72528 + 3a3c93e commit e9c320b

File tree

502 files changed

+65386
-27092
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

502 files changed

+65386
-27092
lines changed

‎AzurePowershell.Test.targets‎

Lines changed: 71 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&#x26;!AzureRTCleanUp"</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">
@@ -113,6 +115,14 @@
113115
<Xunit.Runner.MSBuild.xunit Assemblies="$(_RecoveryServicesTestAssembly)" Html="$(TestOutputDirectory)\RecoveryServices.xunit.dll.html" Verbose="false"
114116
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
115117
</Target>
118+
119+
<Target Name="TestStorSimple">
120+
<PropertyGroup>
121+
<_StorSimpleTestAssembly>.\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll</_StorSimpleTestAssembly>
122+
</PropertyGroup>
123+
<Xunit.Runner.MSBuild.xunit Assemblies="$(_StorSimpleTestAssembly)" Html="$(TestOutputDirectory)\StorSimple.xunit.dll.html" Verbose="false"
124+
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
125+
</Target>
116126

117127
<!-- Run the scenario tests -->
118128
<Target Name="ScenarioTest" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
@@ -186,6 +196,14 @@
186196
ContinueOnError="false" />
187197
</Target>
188198

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+
189207
<Target Name="AzureRTMulti" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
190208
<Message Importance="high" Text="Running tests:" />
191209
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
@@ -198,7 +216,7 @@
198216
<Message Importance="high" Text="Running AzureRT all tests..." />
199217
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
200218
<Exec
201-
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"
202220
ContinueOnError="false" />
203221
</Target>
204222

@@ -208,33 +226,67 @@
208226
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
209227
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
210228
<Exec
211-
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"
212230
ContinueOnError="true" />
213231
<Exec
214-
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"
215233
ContinueOnError="false" />
216234
</Target>
217235

218236
<Target Name="AzureRTSeq" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
219237
<Message Importance="high" Text="Running AzureRT all tests..." />
220238

221239
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
222-
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
223240
<Exec
224-
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"
225242
ContinueOnError="true" />
226243
</Target>
227244

228-
<Target Name="AzureRTPar" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
245+
<Target Name="AzureRTNetwork" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
246+
<Message Importance="high" Text="Running AzureRT all tests..." />
247+
248+
<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">
229255
<Message Importance="high" Text="Running AzureRT all tests..." />
230256

231257
<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+
232266
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
233267
<Exec
234268
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTAllTestFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
235269
ContinueOnError="false" />
236270
</Target>
237271

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+
238290
<Target Name="AzureRTAllPreview" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
239291
<Message Importance="high" Text="Running AzureRT all tests..." />
240292
<Delete Files="$(TestOutputDirectory)\RTAddVhdDebug.trx" />
@@ -243,7 +295,7 @@
243295
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:Sequential /resultsfile:$(TestOutputDirectory)\RTAddVhdDebug.trx"
244296
ContinueOnError="true" />
245297
<Exec
246-
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"
247299
ContinueOnError="false" />
248300
</Target>
249301

@@ -255,6 +307,14 @@
255307
ContinueOnError="false" />
256308
</Target>
257309

310+
<Target Name="AzureRTCleanUp" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
311+
<Message Importance="high" Text="Running AzureRT clean up tests..." />
312+
<Delete Files="$(TestOutputDirectory)\RTCleanUpDebug.trx" />
313+
<Exec
314+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:AzureRTCleanUp /resultsfile:$(TestOutputDirectory)\RTCleanUpDebug.trx"
315+
ContinueOnError="false" />
316+
</Target>
317+
258318
<!-- DSC extension related targets -->
259319
<Target Name="TestDSCExtension_x64">
260320
<Message Importance="high" Text="Running DSC extension BVT x64 tests..." />

‎build.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
<!-- Run checkin tests for each pull request -->
196196
<Target Name="Test" DependsOnTargets="BuildDebug;BeforeRunTests">
197197
<Message Importance="high" Text="Running check in tests..." />
198-
<CallTarget Targets="KeyVaultTests; SqlTests; CommonTests; TestManagement; TestHDInsight; TestManagedCache; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestResourceManager; MockedScenarioTests; TestDSCExtension_x64; TestBatch; TestDataFactoryManager; TestRecoveryServices; TestStreamAnalyticsManager"/>
198+
<CallTarget Targets="KeyVaultTests; SqlTests; CommonTests; TestManagement; TestHDInsight; TestManagedCache; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestResourceManager; MockedScenarioTests; TestDSCExtension_x64; TestBatch; TestDataFactoryManager; TestRecoveryServices; TestStreamAnalyticsManager; TestStorSimple"/>
199199
</Target>
200200

201201
<!-- Run Full switch with scenario tests -->

‎setup/azurecmd.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="0.8.13" ?>
8+
<?define version="0.8.14" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

0 commit comments

Comments
 (0)