Skip to content

Commit 579cd16

Browse files
huangpfhuangpf
committed
Merge pull request Azure#405 from Azure/dev
HPF PR: dev <- Azure:dev
2 parents 99e7994 + 8c7eb90 commit 579cd16

File tree

9 files changed

+0
-94
lines changed

9 files changed

+0
-94
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,49 +20,42 @@ namespace Microsoft.Azure.Commands.Batch.Test.ScenarioTests
2020
public class BatchAccountTests : WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
2121
{
2222
[Fact]
23-
[Trait(Category.AcceptanceType, Category.CheckIn)]
2423
public void TestGetNonExistingBatchAccount()
2524
{
2625
BatchController.NewInstance.RunPsTest("Test-GetNonExistingBatchAccount");
2726
}
2827

2928
[Fact]
30-
[Trait(Category.AcceptanceType, Category.CheckIn)]
3129
public void TestCreatesNewBatchAccount()
3230
{
3331
BatchController.NewInstance.RunPsTest("Test-CreatesNewBatchAccount");
3432
}
3533

3634
[Fact]
37-
[Trait(Category.AcceptanceType, Category.CheckIn)]
3835
public void TestCreateExistingBatchAccount()
3936
{
4037
BatchController.NewInstance.RunPsTest("Test-CreateExistingBatchAccount");
4138
}
4239

4340
[Fact]
44-
[Trait(Category.AcceptanceType, Category.CheckIn)]
4541
public void TestUpdatesExistingBatchAccount()
4642
{
4743
BatchController.NewInstance.RunPsTest("Test-UpdatesExistingBatchAccount");
4844
}
4945

5046
[Fact]
51-
[Trait(Category.AcceptanceType, Category.CheckIn)]
5247
public void TestGetBatchAccountsUnderResourceGroups()
5348
{
5449
BatchController.NewInstance.RunPsTest("Test-GetBatchAccountsUnderResourceGroups");
5550
}
5651

5752
[Fact]
58-
[Trait(Category.AcceptanceType, Category.CheckIn)]
5953
public void TestCreateAndRemoveBatchAccountViaPiping()
6054
{
6155
BatchController.NewInstance.RunPsTest("Test-CreateAndRemoveBatchAccountViaPiping");
6256
}
6357

6458
[Fact]
65-
[Trait(Category.AcceptanceType, Category.CheckIn)]
6659
public void TestBatchAccountKeys()
6760
{
6861
BatchController.NewInstance.RunPsTest("Test-BatchAccountKeys");

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public void TestAddCertificate()
3838
}
3939

4040
[Fact]
41-
[Trait(Category.AcceptanceType, Category.CheckIn)]
4241
public void TestGetCertificateByThumbprint()
4342
{
4443
BatchController controller = BatchController.NewInstance;
@@ -60,7 +59,6 @@ public void TestGetCertificateByThumbprint()
6059
}
6160

6261
[Fact]
63-
[Trait(Category.AcceptanceType, Category.CheckIn)]
6462
public void TestListCertificatesByFilter()
6563
{
6664
BatchController controller = BatchController.NewInstance;
@@ -114,7 +112,6 @@ public void TestGetAndListCertificatesWithSelect()
114112
}
115113

116114
[Fact]
117-
[Trait(Category.AcceptanceType, Category.CheckIn)]
118115
public void TestListCertificatesWithMaxCount()
119116
{
120117
BatchController controller = BatchController.NewInstance;
@@ -140,7 +137,6 @@ public void TestListCertificatesWithMaxCount()
140137
}
141138

142139
[Fact]
143-
[Trait(Category.AcceptanceType, Category.CheckIn)]
144140
public void TestListAllCertificates()
145141
{
146142
BatchController controller = BatchController.NewInstance;
@@ -185,7 +181,6 @@ public void TestDeleteCertificate()
185181
}
186182

187183
[Fact]
188-
[Trait(Category.AcceptanceType, Category.CheckIn)]
189184
public void TestCancelCertificateDelete()
190185
{
191186
BatchController controller = BatchController.NewInstance;

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,13 @@ public class ComputeNodeTests : WindowsAzure.Commands.Test.Utilities.Common.RMTe
3030
private const string poolId = ScenarioTestHelpers.SharedPool;
3131

3232
[Fact]
33-
[Trait(Category.AcceptanceType, Category.CheckIn)]
3433
public void TestGetComputeNodeById()
3534
{
3635
BatchController controller = BatchController.NewInstance;
3736
controller.RunPsTest(string.Format("Test-GetComputeNodeById '{0}' '{1}'", accountName, poolId));
3837
}
3938

4039
[Fact]
41-
[Trait(Category.AcceptanceType, Category.CheckIn)]
4240
public void TestListComputeNodesByFilter()
4341
{
4442
BatchController controller = BatchController.NewInstance;
@@ -77,7 +75,6 @@ public void TestGetAndListComputeNodesWithSelect()
7775
}
7876

7977
[Fact]
80-
[Trait(Category.AcceptanceType, Category.CheckIn)]
8178
public void TestListComputeNodesWithMaxCount()
8279
{
8380
BatchController controller = BatchController.NewInstance;
@@ -86,7 +83,6 @@ public void TestListComputeNodesWithMaxCount()
8683
}
8784

8885
[Fact]
89-
[Trait(Category.AcceptanceType, Category.CheckIn)]
9086
public void TestListAllComputeNodes()
9187
{
9288
BatchController controller = BatchController.NewInstance;
@@ -105,7 +101,6 @@ public void TestListAllComputeNodes()
105101
}
106102

107103
[Fact]
108-
[Trait(Category.AcceptanceType, Category.CheckIn)]
109104
public void TestListComputeNodePipeline()
110105
{
111106
BatchController controller = BatchController.NewInstance;
@@ -124,7 +119,6 @@ public void TestListComputeNodePipeline()
124119
}
125120

126121
[Fact]
127-
[Trait(Category.AcceptanceType, Category.CheckIn)]
128122
public void TestRemoveComputeNodeById()
129123
{
130124
TestRemoveComputeNode(false, TestUtilities.GetCurrentMethodName());
@@ -138,7 +132,6 @@ public void TestRemoveComputeNodePipeline()
138132
}
139133

140134
[Fact]
141-
[Trait(Category.AcceptanceType, Category.CheckIn)]
142135
public void TestRemoveMultipleComputeNodes()
143136
{
144137
BatchController controller = BatchController.NewInstance;
@@ -166,42 +159,36 @@ public void TestRemoveMultipleComputeNodes()
166159
}
167160

168161
[Fact]
169-
[Trait(Category.AcceptanceType, Category.CheckIn)]
170162
public void TestRebootComputeNodeById()
171163
{
172164
TestRebootComputeNode(false, TestUtilities.GetCurrentMethodName());
173165
}
174166

175167
[Fact]
176-
[Trait(Category.AcceptanceType, Category.CheckIn)]
177168
public void TestRebootComputeNodePipeline()
178169
{
179170
TestRebootComputeNode(true, TestUtilities.GetCurrentMethodName());
180171
}
181172

182173
[Fact]
183-
[Trait(Category.AcceptanceType, Category.CheckIn)]
184174
public void TestReimageComputeNodeById()
185175
{
186176
TestReimageComputeNode(false, TestUtilities.GetCurrentMethodName());
187177
}
188178

189179
[Fact]
190-
[Trait(Category.AcceptanceType, Category.CheckIn)]
191180
public void TestReimageComputeNodePipeline()
192181
{
193182
TestReimageComputeNode(true, TestUtilities.GetCurrentMethodName());
194183
}
195184

196185
[Fact]
197-
[Trait(Category.AcceptanceType, Category.CheckIn)]
198186
public void TestDisableAndEnableComputeNodeSchedulingById()
199187
{
200188
TestDisableAndEnableComputeNodeScheduling(false, TestUtilities.GetCurrentMethodName());
201189
}
202190

203191
[Fact]
204-
[Trait(Category.AcceptanceType, Category.CheckIn)]
205192
public void TestDisableAndEnableComputeNodeSchedulingPipeline()
206193
{
207194
TestDisableAndEnableComputeNodeScheduling(true, TestUtilities.GetCurrentMethodName());

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ public class ComputeNodeUserTests : WindowsAzure.Commands.Test.Utilities.Common.
3131
private const string poolId = ScenarioTestHelpers.SharedPool;
3232

3333
[Fact]
34-
[Trait(Category.AcceptanceType, Category.CheckIn)]
3534
public void TestCreateComputeNodeUser()
3635
{
3736
BatchController controller = BatchController.NewInstance;
@@ -73,7 +72,6 @@ public void TestCreateComputeNodeUserPipeline()
7372
}
7473

7574
[Fact]
76-
[Trait(Category.AcceptanceType, Category.CheckIn)]
7775
public void TestUpdateComputeNodeUser()
7876
{
7977
BatchController controller = BatchController.NewInstance;

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public class FileTests : WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
3434
private const string startTaskStdOutContent = ScenarioTestHelpers.SharedPoolStartTaskStdOutContent;
3535

3636
[Fact]
37-
[Trait(Category.AcceptanceType, Category.CheckIn)]
3837
public void TestGetNodeFileByTaskByName()
3938
{
4039
BatchController controller = BatchController.NewInstance;
@@ -60,7 +59,6 @@ public void TestGetNodeFileByTaskByName()
6059
}
6160

6261
[Fact]
63-
[Trait(Category.AcceptanceType, Category.CheckIn)]
6462
public void TestListNodeFilesByTaskByFilter()
6563
{
6664
BatchController controller = BatchController.NewInstance;
@@ -87,7 +85,6 @@ public void TestListNodeFilesByTaskByFilter()
8785
}
8886

8987
[Fact]
90-
[Trait(Category.AcceptanceType, Category.CheckIn)]
9188
public void TestListNodeFilesByTaskWithMaxCount()
9289
{
9390
BatchController controller = BatchController.NewInstance;
@@ -113,7 +110,6 @@ public void TestListNodeFilesByTaskWithMaxCount()
113110
}
114111

115112
[Fact]
116-
[Trait(Category.AcceptanceType, Category.CheckIn)]
117113
public void TestListAllNodeFilesByTask()
118114
{
119115
BatchController controller = BatchController.NewInstance;
@@ -139,7 +135,6 @@ public void TestListAllNodeFilesByTask()
139135
}
140136

141137
[Fact]
142-
[Trait(Category.AcceptanceType, Category.CheckIn)]
143138
public void TestListNodeFilesByTaskRecursive()
144139
{
145140
BatchController controller = BatchController.NewInstance;
@@ -165,7 +160,6 @@ public void TestListNodeFilesByTaskRecursive()
165160
}
166161

167162
[Fact]
168-
[Trait(Category.AcceptanceType, Category.CheckIn)]
169163
public void TestListNodeFileByTaskPipeline()
170164
{
171165
BatchController controller = BatchController.NewInstance;
@@ -191,7 +185,6 @@ public void TestListNodeFileByTaskPipeline()
191185
}
192186

193187
[Fact]
194-
[Trait(Category.AcceptanceType, Category.CheckIn)]
195188
public void TestGetNodeFileContentByTaskByName()
196189
{
197190
BatchController controller = BatchController.NewInstance;
@@ -219,7 +212,6 @@ public void TestGetNodeFileContentByTaskByName()
219212
}
220213

221214
[Fact]
222-
[Trait(Category.AcceptanceType, Category.CheckIn)]
223215
public void TestGetNodeFileContentByTaskPipeline()
224216
{
225217
BatchController controller = BatchController.NewInstance;
@@ -247,7 +239,6 @@ public void TestGetNodeFileContentByTaskPipeline()
247239
}
248240

249241
[Fact]
250-
[Trait(Category.AcceptanceType, Category.CheckIn)]
251242
public void TestGetNodeFileByComputeNodeByName()
252243
{
253244
BatchController controller = BatchController.NewInstance;
@@ -267,7 +258,6 @@ public void TestGetNodeFileByComputeNodeByName()
267258
}
268259

269260
[Fact]
270-
[Trait(Category.AcceptanceType, Category.CheckIn)]
271261
public void TestListNodeFilesByComputeNodeByFilter()
272262
{
273263
BatchController controller = BatchController.NewInstance;
@@ -288,7 +278,6 @@ public void TestListNodeFilesByComputeNodeByFilter()
288278
}
289279

290280
[Fact]
291-
[Trait(Category.AcceptanceType, Category.CheckIn)]
292281
public void TestListNodeFilesByComputeNodeWithMaxCount()
293282
{
294283
BatchController controller = BatchController.NewInstance;
@@ -308,7 +297,6 @@ public void TestListNodeFilesByComputeNodeWithMaxCount()
308297
}
309298

310299
[Fact]
311-
[Trait(Category.AcceptanceType, Category.CheckIn)]
312300
public void TestListAllNodeFilesByComputeNode()
313301
{
314302
BatchController controller = BatchController.NewInstance;
@@ -328,7 +316,6 @@ public void TestListAllNodeFilesByComputeNode()
328316
}
329317

330318
[Fact]
331-
[Trait(Category.AcceptanceType, Category.CheckIn)]
332319
public void TestListNodeFilesByComputeNodeRecursive()
333320
{
334321
BatchController controller = BatchController.NewInstance;
@@ -369,7 +356,6 @@ public void TestListNodeFileByComputeNodePipeline()
369356
}
370357

371358
[Fact]
372-
[Trait(Category.AcceptanceType, Category.CheckIn)]
373359
public void TestGetNodeFileContentByComputeNodeByName()
374360
{
375361
BatchController controller = BatchController.NewInstance;
@@ -388,7 +374,6 @@ public void TestGetNodeFileContentByComputeNodeByName()
388374
}
389375

390376
[Fact]
391-
[Trait(Category.AcceptanceType, Category.CheckIn)]
392377
public void TestGetNodeFileContentByComputeNodeByPipeline()
393378
{
394379
BatchController controller = BatchController.NewInstance;
@@ -407,7 +392,6 @@ public void TestGetNodeFileContentByComputeNodeByPipeline()
407392
}
408393

409394
[Fact]
410-
[Trait(Category.AcceptanceType, Category.CheckIn)]
411395
public void TestGetRemoteDesktopProtocolFileById()
412396
{
413397
BatchController controller = BatchController.NewInstance;
@@ -426,7 +410,6 @@ public void TestGetRemoteDesktopProtocolFileById()
426410
}
427411

428412
[Fact]
429-
[Trait(Category.AcceptanceType, Category.CheckIn)]
430413
public void TestGetRemoteDesktopProtocolFilePipeline()
431414
{
432415
BatchController controller = BatchController.NewInstance;
@@ -452,21 +435,18 @@ public void TestDeleteNodeFileByTaskByName()
452435
}
453436

454437
[Fact]
455-
[Trait(Category.AcceptanceType, Category.CheckIn)]
456438
public void TestDeleteNodeFileByTaskByPipeline()
457439
{
458440
TestDeleteNodeFileByTask(true, TestUtilities.GetCurrentMethodName());
459441
}
460442

461443
[Fact]
462-
[Trait(Category.AcceptanceType, Category.CheckIn)]
463444
public void TestDeleteNodeFileByComputeNodeByName()
464445
{
465446
TestDeleteNodeFileByComputeNode(false, TestUtilities.GetCurrentMethodName());
466447
}
467448

468449
[Fact]
469-
[Trait(Category.AcceptanceType, Category.CheckIn)]
470450
public void TestDeleteNodeFileByComputeNodeByPipeline()
471451
{
472452
TestDeleteNodeFileByComputeNode(true, TestUtilities.GetCurrentMethodName());

0 commit comments

Comments
 (0)