From 40f4b30361d10db4ac35bcec5e172e8f6ae012c4 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Mon, 14 Aug 2017 16:33:21 -0700
Subject: [PATCH] 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 c4a056cd5d..be79d1cfce 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -145,12 +145,10 @@
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
 
-<!-- This uses SetUpFixture, which older versions of nant don't seem to understand, so commenting for now
   <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.permissions">
     <arg value="./bin/OpenSim.Tests.Permissions.dll" />
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
--->
   
 <delete dir="%temp%"/>
 </target>
@@ -267,12 +265,10 @@
     <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" />
   </exec>
 
-<!--
  <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests.permissions">
     <arg value="./bin/OpenSim.Tests.Permissions.dll" />
     <arg value="-xml=test-results/OpenSim.Tests.Permissions.dll-Results.xml" />
   </exec>
--->
   
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 
@@ -285,7 +281,7 @@
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
-<!-- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" />  -->
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
 </target>
 
 <target name="doxygen">
diff --git a/OpenSim/Tests/Permissions/DirectTransferTests.cs b/OpenSim/Tests/Permissions/DirectTransferTests.cs
index c68bbdfed7..c3dfa6c942 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 66a228a28d..e33332a6c5 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();
         }