From 40f4b30361d10db4ac35bcec5e172e8f6ae012c4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 14 Aug 2017 16:33:21 -0700
Subject: Strengthen the tests for the possibility that SetUpFixture does not
run in the beginning.
---
.nant/local.include | 6 +-----
OpenSim/Tests/Permissions/DirectTransferTests.cs | 7 +++++++
OpenSim/Tests/Permissions/IndirectTransferTests.cs | 6 ++++++
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/.nant/local.include b/.nant/local.include
index c4a056c..be79d1c 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -145,12 +145,10 @@
-
@@ -267,12 +265,10 @@
-
@@ -285,7 +281,7 @@
-
+
diff --git a/OpenSim/Tests/Permissions/DirectTransferTests.cs b/OpenSim/Tests/Permissions/DirectTransferTests.cs
index c68bbdf..c3dfa6c 100644
--- a/OpenSim/Tests/Permissions/DirectTransferTests.cs
+++ b/OpenSim/Tests/Permissions/DirectTransferTests.cs
@@ -44,6 +44,13 @@ namespace OpenSim.Tests.Permissions
[SetUp]
public void SetUp()
{
+ // In case we're dealing with some older version of nunit
+ if (Common.TheInstance == null)
+ {
+ Common c = new Common();
+ c.SetUp();
+ }
+
Common.TheInstance.DeleteObjectsFolders();
}
diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs
index 66a228a..e33332a 100644
--- a/OpenSim/Tests/Permissions/IndirectTransferTests.cs
+++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs
@@ -46,6 +46,12 @@ namespace OpenSim.Tests.Permissions
[SetUp]
public void SetUp()
{
+ // In case we're dealing with some older version of nunit
+ if (Common.TheInstance == null)
+ {
+ Common c = new Common();
+ c.SetUp();
+ }
Common.TheInstance.DeleteObjectsFolders();
}
--
cgit v1.1