Skip to content

Commit 58c01c4

Browse files
author
Maddie Clayton
authored
Merge pull request Azure#5474 from maddieclayton/ondemandnetwork
Move short running tests from On-Demand to checkin
2 parents 66fe8e8 + f2e671d commit 58c01c4

File tree

20 files changed

+62
-13
lines changed

20 files changed

+62
-13
lines changed

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AEMExtensionTests.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,28 @@ public void TestAEMExtensionBasicWindowsWAD()
3131
}
3232

3333
[Fact]
34+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3435
public void TestAEMExtensionBasicWindows()
3536
{
3637
ComputeTestController.NewInstance.RunPsTest("Test-AEMExtensionBasicWindows");
3738
}
3839

3940
[Fact]
41+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4042
public void TestAEMExtensionBasicLinuxWAD()
4143
{
4244
ComputeTestController.NewInstance.RunPsTest("Test-AEMExtensionBasicLinuxWAD");
4345
}
4446

4547
[Fact]
48+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4649
public void TestAEMExtensionBasicLinux()
4750
{
4851
ComputeTestController.NewInstance.RunPsTest("Test-AEMExtensionBasicLinux");
4952
}
5053

5154
[Fact]
55+
[Trait(Category.AcceptanceType, Category.CheckIn)]
5256
public void TestAEMExtensionAdvancedWindowsWAD()
5357
{
5458
ComputeTestController.NewInstance.RunPsTest("Test-AEMExtensionAdvancedWindowsWAD");
@@ -61,12 +65,14 @@ public void TestAEMExtensionAdvancedWindows()
6165
}
6266

6367
[Fact]
68+
[Trait(Category.AcceptanceType, Category.CheckIn)]
6469
public void TestAEMExtensionAdvancedLinuxWAD()
6570
{
6671
ComputeTestController.NewInstance.RunPsTest("Test-AEMExtensionAdvancedLinuxWAD");
6772
}
6873

6974
[Fact]
75+
[Trait(Category.AcceptanceType, Category.CheckIn)]
7076
public void TestAEMExtensionAdvancedLinux()
7177
{
7278
ComputeTestController.NewInstance.RunPsTest("Test-AEMExtensionAdvancedLinux");
@@ -79,20 +85,21 @@ public void TestAEMExtensionAdvancedWindowsMD()
7985
}
8086

8187
[Fact]
88+
[Trait(Category.AcceptanceType, Category.CheckIn)]
8289
public void TestAEMExtensionAdvancedLinuxMD()
8390
{
8491
ComputeTestController.NewInstance.RunPsTest("Test-AEMExtensionAdvancedLinuxMD");
8592
}
8693

87-
[Trait(Category.AcceptanceType, Category.CheckIn)]
8894
[Fact]
95+
[Trait(Category.AcceptanceType, Category.CheckIn)]
8996
public void TestAEMExtensionAdvancedLinuxMD_ESeries()
9097
{
9198
ComputeTestController.NewInstance.RunPsTest("Test-AEMExtensionAdvancedLinuxMD_E");
9299
}
93100

94-
[Trait(Category.AcceptanceType, Category.CheckIn)]
95101
[Fact]
102+
[Trait(Category.AcceptanceType, Category.CheckIn)]
96103
public void TestAEMExtensionAdvancedLinuxMD_DSeries()
97104
{
98105
ComputeTestController.NewInstance.RunPsTest("Test-AEMExtensionAdvancedLinuxMD_D");

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DiskRPTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ public DiskRPTests(Xunit.Abstractions.ITestOutputHelper output)
2525
}
2626

2727
[Fact]
28+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2829
public void TestDisk()
2930
{
3031
ComputeTestController.NewInstance.RunPsTest("Test-Disk");
3132
}
3233

3334

3435
[Fact]
36+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3537
public void TestSnapshot()
3638
{
3739
ComputeTestController.NewInstance.RunPsTest("Test-Snapshot");

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/RunnerTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Microsoft.IdentityModel.Clients.ActiveDirectory;
22
using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
3+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
34
using System;
45
using System.Collections.Generic;
56
using System.IO;
@@ -15,6 +16,7 @@ public RunnerTests(Xunit.Abstractions.ITestOutputHelper output)
1516
}
1617

1718
[Fact]
19+
[Trait(Category.AcceptanceType, Category.CheckIn)]
1820
public void ExecuteRunnerTests()
1921
{
2022
var mode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public StrategiesVirtualMachineTests(Xunit.Abstractions.ITestOutputHelper output
2626
}
2727

2828
[Fact]
29-
[Trait(Category.RunType, Category.CheckIn)]
29+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3030
public void TestSimpleNewVm()
3131
{
3232
ComputeTestController.NewInstance.RunPsTest("Test-SimpleNewVm");

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StrategiesVmssTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public StrategiesVmssTests(Xunit.Abstractions.ITestOutputHelper output)
2626
}
2727

2828
[Fact]
29-
[Trait(Category.RunType, Category.CheckIn)]
29+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3030
public void TestSimpleNewVmss()
3131
{
3232
ComputeTestController.NewInstance.RunPsTest("Test-SimpleNewVmss");

src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoryGatewayTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public void TestGetNonExistingDataFactoryGateway()
3232
}
3333

3434
[Fact]
35+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3536
public void TestCreateDataFactoryGateway()
3637
{
3738
RunPowerShellTest("Test-DataFactoryGateway");

src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoryTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,21 @@ public void TestGetNonExistingDataFactory()
3232
}
3333

3434
[Fact]
35+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3536
public void TestCreateDataFactory()
3637
{
3738
RunPowerShellTest("Test-CreateDataFactory");
3839
}
3940

4041
[Fact]
42+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4143
public void TestDeleteDataFactoryWithDataFactoryParameter()
4244
{
4345
RunPowerShellTest("Test-DeleteDataFactoryWithDataFactoryParameter");
4446
}
4547

4648
[Fact]
49+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4750
public void TestDataFactoryPiping()
4851
{
4952
RunPowerShellTest("Test-DataFactoryPiping");

src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/HubTests.cs

Lines changed: 2 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.DataFactories.Test
@@ -24,6 +25,7 @@ public HubTests(Xunit.Abstractions.ITestOutputHelper output)
2425
}
2526

2627
[Fact]
28+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2729
public void TestHub()
2830
{
2931
RunPowerShellTest("Test-Hub");

src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/LinkedServiceTests.cs

Lines changed: 4 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.DataFactories.Test
@@ -24,18 +25,21 @@ public LinkedServiceTests(Xunit.Abstractions.ITestOutputHelper output)
2425
}
2526

2627
[Fact]
28+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2729
public void TestLinkedService()
2830
{
2931
RunPowerShellTest("Test-LinkedService");
3032
}
3133

3234
[Fact]
35+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3336
public void TestLinkedServiceWithDataFactoryParameter()
3437
{
3538
RunPowerShellTest("Test-LinkedServiceWithDataFactoryParameter");
3639
}
3740

3841
[Fact]
42+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3943
public void TestLinkedServicePiping()
4044
{
4145
RunPowerShellTest("Test-LinkedServicePiping");

src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/TableTests.cs

Lines changed: 4 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.DataFactories.Test
@@ -24,18 +25,21 @@ public TableTests(Xunit.Abstractions.ITestOutputHelper output)
2425
}
2526

2627
[Fact]
28+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2729
public void TestTable()
2830
{
2931
RunPowerShellTest("Test-Table");
3032
}
3133

3234
[Fact]
35+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3336
public void TestTableWithDataFactoryParameter()
3437
{
3538
RunPowerShellTest("Test-TableWithDataFactoryParameter");
3639
}
3740

3841
[Fact]
42+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3943
public void TestTablePiping()
4044
{
4145
RunPowerShellTest("Test-TablePiping");

src/ResourceManager/KeyVault/Commands.KeyVault.Test/Models/UtilitiesTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public UtilitiesTests(ITestOutputHelper output)
3232
}
3333

3434
[Fact]
35-
[Trait(Category.KeyVault, Category.CheckIn)]
35+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3636
public void ConvertStringAndSecureString()
3737
{
3838
var origStr = "this is test string";
@@ -43,7 +43,7 @@ public void ConvertStringAndSecureString()
4343
}
4444

4545
[Fact]
46-
[Trait(Category.KeyVault, Category.CheckIn)]
46+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4747
public void GetWebKeyFromByok()
4848
{
4949
Random rnd = new Random();
@@ -59,7 +59,7 @@ public void GetWebKeyFromByok()
5959
}
6060

6161
[Fact]
62-
[Trait(Category.KeyVault, Category.CheckIn)]
62+
[Trait(Category.AcceptanceType, Category.CheckIn)]
6363
public void GetWebKeyFromCertificate()
6464
{
6565
string password = "123";

src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/QueryTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,22 @@
1313
// ----------------------------------------------------------------------------------
1414

1515

16+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1617
using Xunit;
1718

1819
namespace Microsoft.Azure.Commands.OperationalInsights.Test
1920
{
2021
public class QueryTests : OperationalInsightsScenarioTestBase
2122
{
2223
[Fact]
24+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2325
public void TestSimpleQuery()
2426
{
2527
RunDataPowerShellTest("Test-SimpleQuery");
2628
}
2729

2830
[Fact]
31+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2932
public void TestSimpleQueryWithTimespan()
3033
{
3134
RunDataPowerShellTest("Test-SimpleQueryWithTimespan");
@@ -38,6 +41,7 @@ public void TestExceptionWithSyntaxError()
3841
}
3942

4043
[Fact]
44+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4145
public void TestExceptionWithShortWait()
4246
{
4347
RunDataPowerShellTest("Test-ExceptionWithShortWait");

src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/Utilitytests.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
1+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2+
using System;
63
using Xunit;
74

85
namespace Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests
96
{
107
public class UtilityTests
118
{
129
[Fact]
10+
[Trait(Category.AcceptanceType, Category.CheckIn)]
1311
public void ValidateResourceGroupAndResourceName_InvalidResourceGroup()
1412
{
1513
string resourceGroup = "subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/Default-Storage-NorthEurope";
@@ -20,6 +18,7 @@ public void ValidateResourceGroupAndResourceName_InvalidResourceGroup()
2018
}
2119

2220
[Fact]
21+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2322
public void ValidateResourceGroupAndResourceName_InvalidRedisCacheName_FullName()
2423
{
2524
string resourceGroup = "Default-Storage-NorthEurope";
@@ -30,6 +29,7 @@ public void ValidateResourceGroupAndResourceName_InvalidRedisCacheName_FullName(
3029
}
3130

3231
[Fact]
32+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3333
public void ValidateResourceGroupAndResourceName_InvalidRedisCacheName_ID()
3434
{
3535
string resourceGroup = "Default-Storage-NorthEurope";
@@ -40,6 +40,7 @@ public void ValidateResourceGroupAndResourceName_InvalidRedisCacheName_ID()
4040
}
4141

4242
[Fact]
43+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4344
public void ValidateResourceGroupAndResourceName_Success()
4445
{
4546
string resourceGroup = "Default-Storage-NorthEurope";

src/ResourceManager/Resources/Commands.Resources.Test/Models.ResourceGroups/ResourceClientTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ public void TestTemplateShowsSuccessMessage()
367367
}
368368

369369
[Fact]
370+
[Trait(Category.AcceptanceType, Category.CheckIn)]
370371
public void NewResourceGroupUsesDeploymentNameForDeploymentName()
371372
{
372373
// fix test flakiness
@@ -573,6 +574,7 @@ public void NewResourceGroupUsesDeploymentNameForDeploymentName()
573574
}
574575

575576
[Fact]
577+
[Trait(Category.AcceptanceType, Category.CheckIn)]
576578
public void NewResourceGroupDeploymentWithDelay()
577579
{
578580
string deploymentName = "abc123";

src/ResourceManager/Resources/Commands.Resources.Test/ResourceGroupDeployments/RemoveAzureResourceGroupDeploymentCommandTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using Moq;
2020
using Xunit;
2121
using Xunit.Abstractions;
22+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2223

2324
namespace Microsoft.Azure.Commands.Resources.Test.Resources
2425
{
@@ -47,6 +48,7 @@ public RemoveAzureResourceGroupDeploymentCommandTests(ITestOutputHelper output)
4748
}
4849

4950
[Fact]
51+
[Trait(Category.AcceptanceType, Category.CheckIn)]
5052
public void RemoveDeployment()
5153
{
5254
commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);

src/ResourceManager/Resources/Commands.Resources.Test/ResourceGroupDeployments/StopAzureResourceGroupDeploymentCommandTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using Moq;
2020
using Xunit;
2121
using Xunit.Abstractions;
22-
22+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2323

2424
namespace Microsoft.Azure.Commands.Resources.Test.Resources
2525
{
@@ -48,6 +48,7 @@ public StopAzureResourceGroupDeploymentCommandTests(ITestOutputHelper output)
4848
}
4949

5050
[Fact]
51+
[Trait(Category.AcceptanceType, Category.CheckIn)]
5152
public void StopsActiveDeployment()
5253
{
5354
commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);

src/ResourceManager/Resources/Commands.Resources.Test/ResourceGroupDeployments/TestAzureResourceGroupDeploymentCommandTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
using Xunit;
2525
using Xunit.Abstractions;
2626
using Microsoft.Azure.ServiceManagemenet.Common.Models;
27+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2728

2829
namespace Microsoft.Azure.Commands.Resources.Test.Resources
2930
{
@@ -52,6 +53,7 @@ public TestAzureResourceGroupDeploymentCommandTests(ITestOutputHelper output)
5253
}
5354

5455
[Fact]
56+
[Trait(Category.AcceptanceType, Category.CheckIn)]
5557
public void ValidatesPSResourceGroupDeploymentWithUserTemplate()
5658
{
5759
PSValidateResourceGroupDeploymentParameters expectedParameters = new PSValidateResourceGroupDeploymentParameters()

0 commit comments

Comments
 (0)