Skip to content

Commit e495a0f

Browse files
huangpfhuangpf
authored
Merge pull request #648 from Azure/dev
huangpf PR: dev <- Azure:dev
2 parents fd111cc + b321db7 commit e495a0f

24 files changed

+9103
-8289
lines changed

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchAccountTests.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1516
using Xunit;
1617

1718
namespace Microsoft.Azure.Commands.Batch.Test.ScenarioTests
@@ -24,42 +25,49 @@ public BatchAccountTests(Xunit.Abstractions.ITestOutputHelper output)
2425
}
2526

2627
[Fact]
28+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2729
public void TestGetNonExistingBatchAccount()
2830
{
2931
BatchController.NewInstance.RunPsTest("Test-GetNonExistingBatchAccount");
3032
}
3133

3234
[Fact]
35+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3336
public void TestCreatesNewBatchAccount()
3437
{
3538
BatchController.NewInstance.RunPsTest("Test-CreatesNewBatchAccount");
3639
}
3740

3841
[Fact]
42+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3943
public void TestUpdatesExistingBatchAccount()
4044
{
4145
BatchController.NewInstance.RunPsTest("Test-UpdatesExistingBatchAccount");
4246
}
4347

4448
[Fact]
49+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4550
public void TestGetBatchAccountsUnderResourceGroups()
4651
{
4752
BatchController.NewInstance.RunPsTest("Test-GetBatchAccountsUnderResourceGroups");
4853
}
4954

5055
[Fact]
56+
[Trait(Category.AcceptanceType, Category.CheckIn)]
5157
public void TestCreateAndRemoveBatchAccountViaPiping()
5258
{
5359
BatchController.NewInstance.RunPsTest("Test-CreateAndRemoveBatchAccountViaPiping");
5460
}
5561

5662
[Fact]
63+
[Trait(Category.AcceptanceType, Category.CheckIn)]
5764
public void TestBatchAccountKeys()
5865
{
5966
BatchController.NewInstance.RunPsTest("Test-BatchAccountKeys");
6067
}
6168

6269
[Fact]
70+
[Trait(Category.AcceptanceType, Category.CheckIn)]
6371
public void TestListNodeAgentSkus()
6472
{
6573
BatchController.NewInstance.RunPsTest("Test-GetBatchNodeAgentSkus");

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
using Microsoft.Azure.Test;
1717
using Microsoft.WindowsAzure.Commands.Utilities.Common;
1818
using Xunit;
19+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1920

2021
namespace Microsoft.Azure.Commands.Batch.Test.ScenarioTests
2122
{
@@ -25,6 +26,7 @@ public class BatchApplicationPackageTests : WindowsAzure.Commands.Test.Utilities
2526
private const string version = "foo";
2627

2728
[Fact]
29+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2830
public void TestUploadApplicationPackage()
2931
{
3032
string id = "newApplicationPackage";
@@ -54,6 +56,7 @@ public void TestUploadApplicationPackage()
5456
}
5557

5658
[Fact]
59+
[Trait(Category.AcceptanceType, Category.CheckIn)]
5760
public void TestUpdateApplicationPackage()
5861
{
5962
string id = "updateApplicationPackage";
@@ -83,6 +86,7 @@ public void TestUpdateApplicationPackage()
8386
}
8487

8588
[Fact]
89+
[Trait(Category.AcceptanceType, Category.CheckIn)]
8690
public void TestCreatePoolWithApplicationPackage()
8791
{
8892
string id = "createPoolWithApplicationPackage";
@@ -111,6 +115,7 @@ public void TestCreatePoolWithApplicationPackage()
111115
}
112116

113117
[Fact]
118+
[Trait(Category.AcceptanceType, Category.CheckIn)]
114119
public void TestUpdatePoolWithApplicationPackage()
115120
{
116121
string id = "updatePoolWithApplicationPackage";

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchApplicationTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616
using Microsoft.Azure.Test;
1717
using Microsoft.WindowsAzure.Commands.Utilities.Common;
1818
using Xunit;
19+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1920

2021
namespace Microsoft.Azure.Commands.Batch.Test.ScenarioTests
2122
{
2223
public class BatchApplicationTests : WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
2324
{
2425
[Fact]
26+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2527
public void TestAddApplication()
2628
{
2729
BatchController.NewInstance.RunPsTest(string.Format("Test-AddApplication"));

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public void TestCertificateCrudOperations()
3535
}
3636

3737
[Fact]
38+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3839
public void TestCancelCertificateDelete()
3940
{
4041
BatchController controller = BatchController.NewInstance;

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

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

3131
[Fact]
32+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3233
public void TestGetComputeNodeById()
3334
{
3435
BatchController controller = BatchController.NewInstance;
3536
controller.RunPsTest(string.Format("Test-GetComputeNodeById '{0}'", poolId));
3637
}
3738

3839
[Fact]
40+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3941
public void TestListComputeNodesByFilter()
4042
{
4143
BatchController controller = BatchController.NewInstance;
@@ -74,6 +76,7 @@ public void TestGetAndListComputeNodesWithSelect()
7476
}
7577

7678
[Fact]
79+
[Trait(Category.AcceptanceType, Category.CheckIn)]
7780
public void TestListComputeNodesWithMaxCount()
7881
{
7982
BatchController controller = BatchController.NewInstance;
@@ -82,6 +85,7 @@ public void TestListComputeNodesWithMaxCount()
8285
}
8386

8487
[Fact]
88+
[Trait(Category.AcceptanceType, Category.CheckIn)]
8589
public void TestListAllComputeNodes()
8690
{
8791
BatchController controller = BatchController.NewInstance;
@@ -100,6 +104,7 @@ public void TestListAllComputeNodes()
100104
}
101105

102106
[Fact]
107+
[Trait(Category.AcceptanceType, Category.CheckIn)]
103108
public void TestListComputeNodePipeline()
104109
{
105110
BatchController controller = BatchController.NewInstance;
@@ -118,6 +123,7 @@ public void TestListComputeNodePipeline()
118123
}
119124

120125
[Fact]
126+
[Trait(Category.AcceptanceType, Category.CheckIn)]
121127
public void TestRemoveComputeNodeById()
122128
{
123129
TestRemoveComputeNode(usePipeline: false, testMethodName: TestUtilities.GetCurrentMethodName());
@@ -131,6 +137,7 @@ public void TestRemoveComputeNodePipeline()
131137
}
132138

133139
[Fact]
140+
[Trait(Category.AcceptanceType, Category.CheckIn)]
134141
public void TestRemoveMultipleComputeNodes()
135142
{
136143
BatchController controller = BatchController.NewInstance;
@@ -158,48 +165,56 @@ public void TestRemoveMultipleComputeNodes()
158165
}
159166

160167
[Fact]
168+
[Trait(Category.AcceptanceType, Category.CheckIn)]
161169
public void TestRebootComputeNodeById()
162170
{
163171
TestRebootComputeNode(usePipeline: false, testMethodName: TestUtilities.GetCurrentMethodName());
164172
}
165173

166174
[Fact]
175+
[Trait(Category.AcceptanceType, Category.CheckIn)]
167176
public void TestRebootComputeNodePipeline()
168177
{
169178
TestRebootComputeNode(usePipeline: true, testMethodName: TestUtilities.GetCurrentMethodName());
170179
}
171180

172181
[Fact]
182+
[Trait(Category.AcceptanceType, Category.CheckIn)]
173183
public void TestReimageComputeNodeById()
174184
{
175185
TestReimageComputeNode(usePipeline: false, testMethodName: TestUtilities.GetCurrentMethodName());
176186
}
177187

178188
[Fact]
189+
[Trait(Category.AcceptanceType, Category.CheckIn)]
179190
public void TestReimageComputeNodePipeline()
180191
{
181192
TestReimageComputeNode(usePipeline: true, testMethodName: TestUtilities.GetCurrentMethodName());
182193
}
183194

184195
[Fact]
196+
[Trait(Category.AcceptanceType, Category.CheckIn)]
185197
public void TestDisableAndEnableComputeNodeSchedulingById()
186198
{
187199
TestDisableAndEnableComputeNodeScheduling(usePipeline: false, testMethodName: TestUtilities.GetCurrentMethodName());
188200
}
189201

190202
[Fact]
203+
[Trait(Category.AcceptanceType, Category.CheckIn)]
191204
public void TestDisableAndEnableComputeNodeSchedulingPipeline()
192205
{
193206
TestDisableAndEnableComputeNodeScheduling(usePipeline: true, testMethodName: TestUtilities.GetCurrentMethodName());
194207
}
195208

196209
[Fact]
210+
[Trait(Category.AcceptanceType, Category.CheckIn)]
197211
public void TestGetComputeNodeRemoteLoginSettingsById()
198212
{
199213
TestGetComputeNodeRemoteLoginSettings(usePipeline: false, testMethodName: TestUtilities.GetCurrentMethodName());
200214
}
201215

202216
[Fact]
217+
[Trait(Category.AcceptanceType, Category.CheckIn)]
203218
public void TestGetComputeNodeRemoteLoginSettingsPipeline()
204219
{
205220
TestGetComputeNodeRemoteLoginSettings(usePipeline: true, testMethodName: TestUtilities.GetCurrentMethodName());

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.cs

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

3030
[Fact]
31+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3132
public void TestCreateComputeNodeUser()
3233
{
3334
BatchController controller = BatchController.NewInstance;
@@ -69,6 +70,7 @@ public void TestCreateComputeNodeUserPipeline()
6970
}
7071

7172
[Fact]
73+
[Trait(Category.AcceptanceType, Category.CheckIn)]
7274
public void TestUpdateComputeNodeUser()
7375
{
7476
BatchController controller = BatchController.NewInstance;

0 commit comments

Comments
 (0)