Skip to content

Commit 4b98454

Browse files
author
Maddie Clayton
authored
Merge pull request #5634 from cormacpayne/move-tests
Move flaky Batch and Profile tests to on-demand build
2 parents ff8bb75 + 421df8e commit 4b98454

File tree

11 files changed

+40
-38
lines changed

11 files changed

+40
-38
lines changed

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchApplicationPackageTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class BatchApplicationPackageTests : WindowsAzure.Commands.Test.Utilities
2626
private const string version = "foo";
2727

2828
[Fact]
29-
[Trait(Category.AcceptanceType, Category.CheckIn)]
29+
[Trait(Category.AcceptanceType, Category.Flaky)]
3030
public void TestUploadApplicationPackage()
3131
{
3232
string id = "newApplicationPackage";
@@ -56,7 +56,7 @@ public void TestUploadApplicationPackage()
5656
}
5757

5858
[Fact]
59-
[Trait(Category.AcceptanceType, Category.CheckIn)]
59+
[Trait(Category.AcceptanceType, Category.Flaky)]
6060
public void TestUpdateApplicationPackage()
6161
{
6262
string id = "updateApplicationPackage";
@@ -86,7 +86,7 @@ public void TestUpdateApplicationPackage()
8686
}
8787

8888
[Fact]
89-
[Trait(Category.AcceptanceType, Category.CheckIn)]
89+
[Trait(Category.AcceptanceType, Category.Flaky)]
9090
public void TestCreatePoolWithApplicationPackage()
9191
{
9292
string id = "createPoolWithApplicationPackage";
@@ -115,7 +115,7 @@ public void TestCreatePoolWithApplicationPackage()
115115
}
116116

117117
[Fact]
118-
[Trait(Category.AcceptanceType, Category.CheckIn)]
118+
[Trait(Category.AcceptanceType, Category.Flaky)]
119119
public void TestUpdatePoolWithApplicationPackage()
120120
{
121121
string id = "updatePoolWithApplicationPackage";

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/CertificateTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ public CertificateTests(Xunit.Abstractions.ITestOutputHelper output)
2828
}
2929

3030
[Fact]
31-
[Trait(Category.AcceptanceType, Category.CheckIn)]
31+
[Trait(Category.AcceptanceType, Category.Flaky)]
3232
public void TestCertificateCrudOperations()
3333
{
3434
BatchController.NewInstance.RunPsTest("Test-CertificateCrudOperations");
3535
}
3636

3737
[Fact]
38-
[Trait(Category.AcceptanceType, Category.CheckIn)]
38+
[Trait(Category.AcceptanceType, Category.Flaky)]
3939
public void TestCancelCertificateDelete()
4040
{
4141
BatchController controller = BatchController.NewInstance;

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public ComputeNodeTests(Xunit.Abstractions.ITestOutputHelper output)
2929
}
3030

3131
[Fact]
32-
[Trait(Category.AcceptanceType, Category.CheckIn)]
32+
[Trait(Category.AcceptanceType, Category.Flaky)]
3333
public void TestRemoveComputeNodes()
3434
{
3535
BatchController controller = BatchController.NewInstance;
@@ -52,7 +52,7 @@ public void TestRemoveComputeNodes()
5252
}
5353

5454
[Fact]
55-
[Trait(Category.AcceptanceType, Category.CheckIn)]
55+
[Trait(Category.AcceptanceType, Category.Flaky)]
5656
public void TestRebootAndReimageComputeNode()
5757
{
5858
BatchController controller = BatchController.NewInstance;
@@ -75,7 +75,7 @@ public void TestRebootAndReimageComputeNode()
7575
}
7676

7777
[Fact]
78-
[Trait(Category.AcceptanceType, Category.CheckIn)]
78+
[Trait(Category.AcceptanceType, Category.Flaky)]
7979
public void TestDisableAndEnableComputeNodeScheduling()
8080
{
8181
BatchController controller = BatchController.NewInstance;
@@ -95,7 +95,7 @@ public void TestDisableAndEnableComputeNodeScheduling()
9595
}
9696

9797
[Fact]
98-
[Trait(Category.AcceptanceType, Category.CheckIn)]
98+
[Trait(Category.AcceptanceType, Category.Flaky)]
9999
public void TestGetComputeNodeRemoteLoginSettings()
100100
{
101101
BatchController controller = BatchController.NewInstance;

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/FileTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public FileTests(Xunit.Abstractions.ITestOutputHelper output)
3030
}
3131

3232
[Fact]
33-
[Trait(Category.AcceptanceType, Category.CheckIn)]
33+
[Trait(Category.AcceptanceType, Category.Flaky)]
3434
public void TestGetNodeFileContentByTask()
3535
{
3636
BatchController controller = BatchController.NewInstance;
@@ -58,7 +58,7 @@ public void TestGetNodeFileContentByTask()
5858
}
5959

6060
[Fact]
61-
[Trait(Category.AcceptanceType, Category.CheckIn)]
61+
[Trait(Category.AcceptanceType, Category.Flaky)]
6262
public void TestGetNodeFileContentByComputeNode()
6363
{
6464
BatchController controller = BatchController.NewInstance;
@@ -77,7 +77,7 @@ public void TestGetNodeFileContentByComputeNode()
7777
}
7878

7979
[Fact]
80-
[Trait(Category.AcceptanceType, Category.CheckIn)]
80+
[Trait(Category.AcceptanceType, Category.Flaky)]
8181
public void TestGetRemoteDesktopProtocolFile()
8282
{
8383
BatchController controller = BatchController.NewInstance;
@@ -96,7 +96,7 @@ public void TestGetRemoteDesktopProtocolFile()
9696
}
9797

9898
[Fact]
99-
[Trait(Category.AcceptanceType, Category.CheckIn)]
99+
[Trait(Category.AcceptanceType, Category.Flaky)]
100100
public void TestDeleteNodeFileByTask()
101101
{
102102
BatchController controller = BatchController.NewInstance;
@@ -123,7 +123,7 @@ public void TestDeleteNodeFileByTask()
123123
}
124124

125125
[Fact]
126-
[Trait(Category.AcceptanceType, Category.CheckIn)]
126+
[Trait(Category.AcceptanceType, Category.Flaky)]
127127
public void TestDeleteNodeFileByComputeNode()
128128
{
129129
BatchController controller = BatchController.NewInstance;

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void TestJobScheduleCRUD()
3434

3535

3636
[Fact]
37-
[Trait(Category.AcceptanceType, Category.CheckIn)]
37+
[Trait(Category.AcceptanceType, Category.Flaky)]
3838
public void TestDisableEnableTerminateJobSchedule()
3939
{
4040
BatchController controller = BatchController.NewInstance;

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ public JobTests(Xunit.Abstractions.ITestOutputHelper output)
2828
}
2929

3030
[Fact]
31-
[Trait(Category.AcceptanceType, Category.CheckIn)]
31+
[Trait(Category.AcceptanceType, Category.Flaky)]
3232
public void TestJobCRUD()
3333
{
3434
BatchController.NewInstance.RunPsTest("Test-JobCRUD");
3535
}
3636

3737

3838
[Fact]
39-
[Trait(Category.AcceptanceType, Category.CheckIn)]
39+
[Trait(Category.AcceptanceType, Category.Flaky)]
4040
public void TestDisableEnableTerminateJob()
4141
{
4242
BatchController controller = BatchController.NewInstance;
@@ -59,7 +59,7 @@ public void TestDisableEnableTerminateJob()
5959
}
6060

6161
[Fact]
62-
[Trait(Category.AcceptanceType, Category.CheckIn)]
62+
[Trait(Category.AcceptanceType, Category.Flaky)]
6363
public void IfJobSetsAutoFailure_ItCompletesWhenAnyTaskFails()
6464
{
6565
BatchController controller = BatchController.NewInstance;

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ public PoolTests(Xunit.Abstractions.ITestOutputHelper output)
3131
}
3232

3333
[Fact]
34-
[Trait(Category.AcceptanceType, Category.CheckIn)]
34+
[Trait(Category.AcceptanceType, Category.Flaky)]
3535
public void TestPoolCRUD()
3636
{
3737
BatchController.NewInstance.RunPsTest("Test-PoolCRUD");
3838
}
3939

4040
[Fact]
41-
[Trait(Category.AcceptanceType, Category.CheckIn)]
41+
[Trait(Category.AcceptanceType, Category.Flaky)]
4242
public void TestResizeAndStopResizePool()
4343
{
4444
BatchController controller = BatchController.NewInstance;
@@ -60,7 +60,7 @@ public void TestResizeAndStopResizePool()
6060
}
6161

6262
[Fact]
63-
[Trait(Category.AcceptanceType, Category.CheckIn)]
63+
[Trait(Category.AcceptanceType, Category.Flaky)]
6464
public void TestAutoScaleActions()
6565
{
6666
BatchController controller = BatchController.NewInstance;
@@ -82,7 +82,7 @@ public void TestAutoScaleActions()
8282
}
8383

8484
[Fact]
85-
[Trait(Category.AcceptanceType, Category.CheckIn)]
85+
[Trait(Category.AcceptanceType, Category.Flaky)]
8686
public void TestChangeOSVersion()
8787
{
8888
BatchController controller = BatchController.NewInstance;

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public TaskTests(Xunit.Abstractions.ITestOutputHelper output)
2626
}
2727

2828
[Fact]
29-
[Trait(Category.AcceptanceType, Category.CheckIn)]
29+
[Trait(Category.AcceptanceType, Category.Flaky)]
3030
public void TestTaskCRUD()
3131
{
3232
BatchController controller = BatchController.NewInstance;
@@ -48,7 +48,7 @@ public void TestTaskCRUD()
4848
}
4949

5050
[Fact]
51-
[Trait(Category.AcceptanceType, Category.CheckIn)]
51+
[Trait(Category.AcceptanceType, Category.Flaky)]
5252
public void TestCreateTaskCollection()
5353
{
5454
BatchController controller = BatchController.NewInstance;
@@ -70,7 +70,7 @@ public void TestCreateTaskCollection()
7070
}
7171

7272
[Fact]
73-
[Trait(Category.AcceptanceType, Category.CheckIn)]
73+
[Trait(Category.AcceptanceType, Category.Flaky)]
7474
public void TestTerminateTask()
7575
{
7676
BatchController controller = BatchController.NewInstance;
@@ -97,7 +97,7 @@ public void TestTerminateTask()
9797
}
9898

9999
[Fact]
100-
[Trait(Category.AcceptanceType, Category.CheckIn)]
100+
[Trait(Category.AcceptanceType, Category.Flaky)]
101101
public void TestListAllSubtasks()
102102
{
103103
BatchController controller = BatchController.NewInstance;

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Constants.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ public class Category
6565
public const string BVT = "BVT";
6666

6767
public const string CheckIn = "CheckIn";
68+
69+
public const string Flaky = "Flaky";
6870

6971
// Run Type
7072
public const string RunType = "RunType";

src/ResourceManager/Profile/Commands.Profile.Test/ArgumentCompleterTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ public ArgumentCompleterTests(ITestOutputHelper output)
3636
}
3737

3838
[Fact]
39-
[Trait(Category.AcceptanceType, Category.CheckIn)]
39+
[Trait(Category.AcceptanceType, Category.Flaky)]
4040
public void TestLocationCompleter()
4141
{
4242
ProfileController.NewInstance.RunPsTest(xunitLogger, "72f988bf-86f1-41af-91ab-2d7cd011db47", "Test-LocationCompleter");
4343
}
4444

4545
[Fact]
46-
[Trait(Category.AcceptanceType, Category.CheckIn)]
46+
[Trait(Category.AcceptanceType, Category.Flaky)]
4747
public void TestResourceGroupCompleter()
4848
{
4949
ProfileController.NewInstance.RunPsTest(xunitLogger, "72f988bf-86f1-41af-91ab-2d7cd011db47", "Test-ResourceGroupCompleter");

src/ResourceManager/Profile/Commands.Profile.Test/LongRunningCmdletTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public LongRunningCmdletTests(ITestOutputHelper output)
4848
}
4949

5050
[Fact]
51-
[Trait(Category.AcceptanceType, Category.CheckIn)]
51+
[Trait(Category.AcceptanceType, Category.Flaky)]
5252
public void CanReceiveAllStreams()
5353
{
5454
Mock<ICommandRuntime> mockRuntime;
@@ -61,7 +61,7 @@ public void CanReceiveAllStreams()
6161
}
6262

6363
[Fact]
64-
[Trait(Category.AcceptanceType, Category.CheckIn)]
64+
[Trait(Category.AcceptanceType, Category.Flaky)]
6565
public void CanSupportShouldProcess()
6666
{
6767
Mock<ICommandRuntime> mockRuntime;
@@ -74,7 +74,7 @@ public void CanSupportShouldProcess()
7474
}
7575

7676
[Fact]
77-
[Trait(Category.AcceptanceType, Category.CheckIn)]
77+
[Trait(Category.AcceptanceType, Category.Flaky)]
7878
public void CanSupportShouldContinue()
7979
{
8080
Mock<ICommandRuntime> mockRuntime;
@@ -88,7 +88,7 @@ public void CanSupportShouldContinue()
8888
}
8989

9090
[Fact]
91-
[Trait(Category.AcceptanceType, Category.CheckIn)]
91+
[Trait(Category.AcceptanceType, Category.Flaky)]
9292
public void CanHandleCmdletException()
9393
{
9494
Mock<ICommandRuntime> mockRuntime;
@@ -103,7 +103,7 @@ public void CanHandleCmdletException()
103103
}
104104

105105
[Fact]
106-
[Trait(Category.AcceptanceType, Category.CheckIn)]
106+
[Trait(Category.AcceptanceType, Category.Flaky)]
107107
public void CanHandleCmdletStop()
108108
{
109109
Mock<ICommandRuntime> mockRuntime;
@@ -129,7 +129,7 @@ public void CanHandleCmdletStop()
129129

130130

131131
[Fact]
132-
[Trait(Category.AcceptanceType, Category.CheckIn)]
132+
[Trait(Category.AcceptanceType, Category.Flaky)]
133133
public void CanHandleShouldProcessExceptionForConfirm()
134134
{
135135
Mock<ICommandRuntime> mockRuntime;
@@ -145,7 +145,7 @@ public void CanHandleShouldProcessExceptionForConfirm()
145145
}
146146

147147
[Fact]
148-
[Trait(Category.AcceptanceType, Category.CheckIn)]
148+
[Trait(Category.AcceptanceType, Category.Flaky)]
149149
public void CanHandleShouldProcessExceptionForWhatIf()
150150
{
151151
Mock<ICommandRuntime> mockRuntime;
@@ -162,7 +162,7 @@ public void CanHandleShouldProcessExceptionForWhatIf()
162162
}
163163

164164
[Fact]
165-
[Trait(Category.AcceptanceType, Category.CheckIn)]
165+
[Trait(Category.AcceptanceType, Category.Flaky)]
166166
public void CanHandleShouldContinueException()
167167
{
168168
Mock<ICommandRuntime> mockRuntime;
@@ -177,7 +177,7 @@ public void CanHandleShouldContinueException()
177177
}
178178

179179
[Fact]
180-
[Trait(Category.AcceptanceType, Category.CheckIn)]
180+
[Trait(Category.AcceptanceType, Category.Flaky)]
181181
public void JobCopiesCmdletParameterSet()
182182
{
183183
Mock<ICommandRuntime> mock = new Mock<ICommandRuntime>();

0 commit comments

Comments
 (0)