Skip to content

Commit fab0668

Browse files
committed
Introduce DefaultTestTimeout = 10s
1 parent 8c8b09c commit fab0668

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

Extensions/Xtensive.Orm.Reprocessing.Tests/ReprocessingBaseTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ namespace Xtensive.Orm.Reprocessing.Tests
1010
[TestFixture]
1111
public abstract class ReprocessingBaseTest : CommonModelTest
1212
{
13+
public const int DefaultTestTimeout = 10000;
14+
1315
protected override void CheckRequirements()
1416
{
1517
base.CheckRequirements();

Extensions/Xtensive.Orm.Reprocessing.Tests/Tests/DeadlockReprocessing.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
namespace Xtensive.Orm.Reprocessing.Tests
1515
{
16-
[TestFixture, Timeout(20000)]
16+
[TestFixture, Timeout(DefaultTestTimeout * 4)]
1717
public class DeadlockReprocessing : ReprocessingBaseTest
1818
{
19-
[Test, Timeout(5000)]
19+
[Test, Timeout(DefaultTestTimeout)]
2020
public void SimpleDeadlockTest()
2121
{
2222
Console.WriteLine("Test started");
@@ -27,7 +27,7 @@ public void SimpleDeadlockTest()
2727
Assert.That(Bar2Count(), Is.EqualTo(2));
2828
}
2929

30-
[Test, Timeout(5000)]
30+
[Test, Timeout(DefaultTestTimeout)]
3131
public void NestedSerializableDeadlockTest()
3232
{
3333
Console.WriteLine("Test started");
@@ -41,7 +41,7 @@ public void NestedSerializableDeadlockTest()
4141
Assert.That(Bar2Count(), Is.EqualTo(4));
4242
}
4343

44-
[Test, Timeout(5000)]
44+
[Test, Timeout(DefaultTestTimeout)]
4545
public void NestedSnapshotDeadlockTest()
4646
{
4747
Console.WriteLine("Test started");
@@ -55,7 +55,7 @@ public void NestedSnapshotDeadlockTest()
5555
Assert.That(Bar2Count(), Is.EqualTo(4));
5656
}
5757

58-
[Test, Timeout(5000)]
58+
[Test, Timeout(DefaultTestTimeout)]
5959
public void NestedNestedSerializableSerializableTest()
6060
{
6161
Console.WriteLine("Test started");

Extensions/Xtensive.Orm.Reprocessing.Tests/Tests/UniqueConstraintViolationReprocessing.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Xtensive.Orm.Reprocessing.Tests
1313
{
14-
[TestFixture, Timeout(60000)]
14+
[TestFixture, Timeout(DefaultTestTimeout * 12)]
1515
public sealed class UniqueConstraintViolationReprocessing : ReprocessingBaseTest
1616
{
1717
private bool treatNullAsUniqueValue;
@@ -22,7 +22,7 @@ public override void TestFixtureSetUp()
2222
treatNullAsUniqueValue = Domain.StorageProviderInfo.ProviderName == WellKnown.Provider.SqlServer;
2323
}
2424

25-
[Test, Timeout(5000)]
25+
[Test, Timeout(DefaultTestTimeout)]
2626
public void SimpleUniqueTest()
2727
{
2828
Console.WriteLine("Test started");
@@ -33,7 +33,7 @@ public void SimpleUniqueTest()
3333
Assert.That(Bar2Count(), Is.EqualTo(2));
3434
}
3535

36-
[Test, Timeout(5000)]
36+
[Test, Timeout(DefaultTestTimeout)]
3737
public void UniqueConstraintViolationExceptionUnique()
3838
{
3939
var i = 0;
@@ -51,7 +51,7 @@ public void UniqueConstraintViolationExceptionUnique()
5151
Assert.That(errorNotified, Is.True);
5252
}
5353

54-
[Test, Timeout(5000)]
54+
[Test, Timeout(DefaultTestTimeout)]
5555
public void UniqueConstraintViolationExceptionPrimary()
5656
{
5757
var i = 0;
@@ -71,7 +71,7 @@ public void UniqueConstraintViolationExceptionPrimary()
7171
}
7272
}
7373

74-
[Test, Timeout(5000)]
74+
[Test, Timeout(DefaultTestTimeout)]
7575
public void NestedSerializablePrimaryKeyConstraintTest()
7676
{
7777
Console.WriteLine("Test started");
@@ -87,7 +87,7 @@ public void NestedSerializablePrimaryKeyConstraintTest()
8787
Assert.That(Bar2Count(), Is.EqualTo(4));
8888
}
8989

90-
[Test, Timeout(5000)]
90+
[Test, Timeout(DefaultTestTimeout)]
9191
public void NestedSnapshotPrimaryKeyConstraintTest()
9292
{
9393
Console.WriteLine("Test started");
@@ -103,7 +103,7 @@ public void NestedSnapshotPrimaryKeyConstraintTest()
103103
Assert.That(Bar2Count(), Is.EqualTo(4));
104104
}
105105

106-
[Test, Timeout(5000)]
106+
[Test, Timeout(DefaultTestTimeout)]
107107
public void NestedSerializableUniqueIndexTest()
108108
{
109109
Console.WriteLine("Test started");
@@ -119,7 +119,7 @@ public void NestedSerializableUniqueIndexTest()
119119
Assert.That(Bar2Count(), Is.EqualTo(4));
120120
}
121121

122-
[Test, Timeout(5000)]
122+
[Test, Timeout(DefaultTestTimeout)]
123123
public void NestedSnapshotUniqueIndexTest()
124124
{
125125
Console.WriteLine("Test started");
@@ -135,7 +135,7 @@ public void NestedSnapshotUniqueIndexTest()
135135
Assert.That(Bar2Count(), Is.EqualTo(4));
136136
}
137137

138-
[Test, Timeout(5000)]
138+
[Test, Timeout(DefaultTestTimeout)]
139139
public void NestedSerializableExternalWithoutTxUniqueIndexTest()
140140
{
141141
Console.WriteLine("Test started");
@@ -162,7 +162,7 @@ public void NestedSerializableExternalWithoutTxUniqueIndexTest()
162162
Assert.That(Bar2Count(), Is.EqualTo(4));
163163
}
164164

165-
[Test, Timeout(5000)]
165+
[Test, Timeout(DefaultTestTimeout)]
166166
public void NestedSnapshotExternalWithoutTxUniqueIndexTest()
167167
{
168168
Console.WriteLine("Test started");
@@ -189,7 +189,7 @@ public void NestedSnapshotExternalWithoutTxUniqueIndexTest()
189189
Assert.That(Bar2Count(), Is.EqualTo(4));
190190
}
191191

192-
[Test, Timeout(5000)]
192+
[Test, Timeout(DefaultTestTimeout)]
193193
public void NestedSerializableExternalWithTxUniqueIndexTest()
194194
{
195195
Console.WriteLine("Test started");
@@ -216,7 +216,7 @@ public void NestedSerializableExternalWithTxUniqueIndexTest()
216216
Assert.That(Bar2Count(), Is.EqualTo(6));
217217
}
218218

219-
[Test, Timeout(5000)]
219+
[Test, Timeout(DefaultTestTimeout)]
220220
public void NestedSnapshotExternalWithTxUniqueIndexTest()
221221
{
222222
Console.WriteLine("Test started");
@@ -243,7 +243,7 @@ public void NestedSnapshotExternalWithTxUniqueIndexTest()
243243
Assert.That(Bar2Count(), Is.EqualTo(6));
244244
}
245245

246-
[Test, Timeout(5000)]
246+
[Test, Timeout(DefaultTestTimeout)]
247247
public void NestedUniqueIndexWithAutoTransaction()
248248
{
249249
Console.WriteLine("Test started");

0 commit comments

Comments
 (0)