Skip to content

Commit 1ba94f8

Browse files
committed
Merge pull request #471 from ogail/dev
Move SQL tests to post check-in tests
2 parents 480d0da + c35d556 commit 1ba94f8

File tree

3 files changed

+9
-19
lines changed

3 files changed

+9
-19
lines changed

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ public void TestGetResourcesViaPipingFromAnotherResource()
7777
}
7878

7979
[Fact]
80-
[Trait(Category.AcceptanceType, Category.CheckIn)]
8180
public void TestMoveAResourceTest()
8281
{
8382
ResourcesController.NewInstance.RunPsTest("Test-MoveAResource");

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DataMaskingTests.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ public void TestDatabaseDataMaskingPolicyEnablementToggling()
2727
RunPowerShellTest("Test-DatabaseDataMaskingPolicyEnablementToggling");
2828
}
2929

30-
[Fact(Skip = "Test executes for long time period")]
30+
[Fact]
3131
[Trait(Category.RunType, Category.LiveOnly)]
32-
[Trait(Category.AcceptanceType, Category.CheckIn)]
3332
public void TestDatabaseDataMaskingLevelChanges()
3433
{
3534
RunPowerShellTest("Test-DatabaseDataMaskingLevelChanges");
@@ -63,9 +62,8 @@ public void TestDatabaseDataMaskingTextRuleLifecycle()
6362
RunPowerShellTest("Test-DatabaseDataMaskingTextRuleLifecycle");
6463
}
6564

66-
[Fact(Skip = "Test executes for long time period")]
65+
[Fact]
6766
[Trait(Category.RunType, Category.LiveOnly)]
68-
[Trait(Category.AcceptanceType, Category.CheckIn)]
6967
public void TestDatabaseDataMaskingRuleCreationFailures()
7068
{
7169
RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationFailures");

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SecurityTests.cs

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,21 @@ public void TestDatabaseUpdatePolicyWithStorage()
2626
RunPowerShellTest("Test-DatabaseUpdatePolicyWithStorage");
2727
}
2828

29-
[Fact(Skip = "Test executes for long time period")]
29+
[Fact]
3030
[Trait(Category.RunType, Category.LiveOnly)]
31-
[Trait(Category.AcceptanceType, Category.CheckIn)]
3231
public void TestServerUpdatePolicyWithStorage()
3332
{
3433
RunPowerShellTest("Test-ServerUpdatePolicyWithStorage");
3534
}
3635

37-
[Fact(Skip = "Test executes for long time period")]
38-
[Trait(Category.AcceptanceType, Category.CheckIn)]
36+
[Fact]
3937
public void TestDatabaseUpdatePolicyWithEventTypes()
4038
{
4139
RunPowerShellTest("Test-DatabaseUpdatePolicyWithEventTypes");
4240
}
4341

44-
[Fact(Skip = "Skip for the version header upgrade on Storage library.")]
42+
[Fact]
4543
[Trait(Category.RunType, Category.LiveOnly)]
46-
[Trait(Category.AcceptanceType, Category.CheckIn)]
4744
public void TestServerUpdatePolicyWithEventTypes()
4845
{
4946
RunPowerShellTest("Test-ServerUpdatePolicyWithEventTypes");
@@ -184,33 +181,29 @@ public void TestServerStorageKeyRotation()
184181
RunPowerShellTest("Test-ServerStorageKeyRotation");
185182
}
186183

187-
[Fact(Skip = "Test executes for long time period")]
184+
[Fact]
188185
[Trait(Category.RunType, Category.LiveOnly)]
189-
[Trait(Category.AcceptanceType, Category.CheckIn)]
190186
public void TestServerUpdatePolicyWithRetention()
191187
{
192188
RunPowerShellTest("Test-ServerUpdatePolicyWithRetention");
193189
}
194190

195-
[Fact(Skip = "Test executes for long time period")]
191+
[Fact]
196192
[Trait(Category.RunType, Category.LiveOnly)]
197-
[Trait(Category.AcceptanceType, Category.CheckIn)]
198193
public void TestDatabaseUpdatePolicyWithRetention()
199194
{
200195
RunPowerShellTest("Test-DatabaseUpdatePolicyWithRetention");
201196
}
202197

203-
[Fact(Skip = "Test executes for long time period")]
198+
[Fact]
204199
[Trait(Category.RunType, Category.LiveOnly)]
205-
[Trait(Category.AcceptanceType, Category.CheckIn)]
206200
public void TestServerRetentionKeepProperties()
207201
{
208202
RunPowerShellTest("Test-ServerRetentionKeepProperties");
209203
}
210204

211-
[Fact(Skip = "Test executes for long time period")]
205+
[Fact]
212206
[Trait(Category.RunType, Category.LiveOnly)]
213-
[Trait(Category.AcceptanceType, Category.CheckIn)]
214207
public void TestDatabaseRetentionKeepProperties()
215208
{
216209
RunPowerShellTest("Test-DatabaseRetentionKeepProperties");

0 commit comments

Comments
 (0)