Skip to content

Commit a91906e

Browse files
unknownunknown
authored andcommitted
Fix AzureRT sequential test settings.
1 parent 743109a commit a91906e

File tree

2 files changed

+23
-15
lines changed

2 files changed

+23
-15
lines changed

AzurePowershell.Test.targets

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<ComputeTestDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll</ComputeTestDebug>
1212
<NetworkTestDebug>.\src\ResourceManager\Network\Commands.Network.Test\bin\Debug\Microsoft.Azure.Commands.Network.Test.dll</NetworkTestDebug>
1313
<AzureRTTestSettings>.\src\AzureRT.testsettings</AzureRTTestSettings>
14+
<AzureRTSeqTestSettings>.\src\AzureRTSeq.testsettings</AzureRTSeqTestSettings>
1415
<AzureRTTestContainer>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</AzureRTTestContainer>
1516
<StorageScenarioTestDebug>src\ServiceManagement\Storage\Commands.Storage.ScenarioTest\bin\Debug\CLITest.dll</StorageScenarioTestDebug>
1617
<ManagementTestDebug>.\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll</ManagementTestDebug>
@@ -258,19 +259,11 @@
258259
ContinueOnError="false" />
259260
</Target>
260261

261-
<Target Name="AzureRTBVTsSeq" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
262-
<Message Importance="high" Text="Running AzureRT BVT tests..." />
263-
<Delete Files="$(TestOutputDirectory)\RTBVTDebug.trx" />
264-
<Exec
265-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:BVT /resultsfile:$(TestOutputDirectory)\RTBVTDebug.trx"
266-
ContinueOnError="false" />
267-
</Target>
268-
269262
<Target Name="AzureRTOne" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
270263
<Message Importance="high" Text="Running a specific tests..." />
271264
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
272265
<Exec
273-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /test:$(TestName) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug.trx"
266+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) /test:$(TestName) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug.trx"
274267
ContinueOnError="false" />
275268
</Target>
276269

@@ -286,15 +279,15 @@
286279
<Message Importance="high" Text="Running tests:" />
287280
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
288281
<Exec
289-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) $(TestParams) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug.trx"
282+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) $(TestParams) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug.trx"
290283
ContinueOnError="false" />
291284
</Target>
292285

293286
<Target Name="AzureRTAll" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
294287
<Message Importance="high" Text="Running AzureRT all tests..." />
295288
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
296289
<Exec
297-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTAllTestFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
290+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) /category:$(AzureRTAllTestFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
298291
ContinueOnError="false" />
299292
</Target>
300293

@@ -304,7 +297,7 @@
304297
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
305298
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
306299
<Exec
307-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTSeqAllFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
300+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) /category:$(AzureRTSeqAllFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
308301
ContinueOnError="true" />
309302
<Exec
310303
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTParAllFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
@@ -316,7 +309,7 @@
316309

317310
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
318311
<Exec
319-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTSeqAllFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
312+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) /category:$(AzureRTSeqAllFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
320313
ContinueOnError="true" />
321314
</Target>
322315

@@ -325,7 +318,7 @@
325318

326319
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
327320
<Exec
328-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:Network /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
321+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) /category:Network /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
329322
ContinueOnError="false" />
330323
</Target>
331324

@@ -334,7 +327,7 @@
334327

335328
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
336329
<Exec
337-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTUploadSeqFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
330+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) /category:$(AzureRTUploadSeqFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
338331
ContinueOnError="false" />
339332
</Target>
340333

src/AzureRTSeq.testsettings

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<TestSettings
3+
id="bbc9ef85-493f-459f-bc76-434f1966c32c"
4+
name="AzureRTSeq"
5+
enableDefaultDataCollectors="false"
6+
xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
7+
<Description>These are test settings for AzureRT test run.</Description>
8+
<Deployment>
9+
<DeploymentItem filename="ServiceManagement\Compute\Commands.ServiceManagement.Test\Resources\" />
10+
<DeploymentItem filename="Package\Debug\" />
11+
</Deployment>
12+
<Execution parallelTestCount="1">
13+
<Timeouts testTimeout="3000000" />
14+
</Execution>
15+
</TestSettings>

0 commit comments

Comments
 (0)