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.

---
 OpenSim/Tests/Permissions/DirectTransferTests.cs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'OpenSim/Tests/Permissions/DirectTransferTests.cs')

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();
         }
 
-- 
cgit v1.1


From 6a0b7a607f13fcee447c9d10224d5ea77db4f355 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 14 Aug 2017 16:40:36 -0700
Subject: This is the correct work around. Jenkins is confuzzled.

---
 OpenSim/Tests/Permissions/DirectTransferTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Tests/Permissions/DirectTransferTests.cs')

diff --git a/OpenSim/Tests/Permissions/DirectTransferTests.cs b/OpenSim/Tests/Permissions/DirectTransferTests.cs
index c3dfa6c..0f251db 100644
--- a/OpenSim/Tests/Permissions/DirectTransferTests.cs
+++ b/OpenSim/Tests/Permissions/DirectTransferTests.cs
@@ -47,8 +47,8 @@ namespace OpenSim.Tests.Permissions
             // In case we're dealing with some older version of nunit
             if (Common.TheInstance == null)
             {
-                Common c = new Common();
-                c.SetUp();
+                Common.TheInstance = new Common();
+                Common.TheInstance.SetUp();
             }
 
             Common.TheInstance.DeleteObjectsFolders();
-- 
cgit v1.1


From 8b6557e377f7bac1bdb38f3e6dd22c797417d09c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 14 Aug 2017 16:49:11 -0700
Subject: Let's try giving Common a default constructor instead of the
 workaround

---
 OpenSim/Tests/Permissions/DirectTransferTests.cs | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'OpenSim/Tests/Permissions/DirectTransferTests.cs')

diff --git a/OpenSim/Tests/Permissions/DirectTransferTests.cs b/OpenSim/Tests/Permissions/DirectTransferTests.cs
index 0f251db..c68bbdf 100644
--- a/OpenSim/Tests/Permissions/DirectTransferTests.cs
+++ b/OpenSim/Tests/Permissions/DirectTransferTests.cs
@@ -44,13 +44,6 @@ namespace OpenSim.Tests.Permissions
         [SetUp]
         public void SetUp()
         {
-            // In case we're dealing with some older version of nunit
-            if (Common.TheInstance == null)
-            {
-                Common.TheInstance = new Common();
-                Common.TheInstance.SetUp();
-            }
-
             Common.TheInstance.DeleteObjectsFolders();
         }
 
-- 
cgit v1.1


From eb837defdf7d9f260603fe400b3a482258605f43 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 14 Aug 2017 16:55:50 -0700
Subject: Revert "Let's try giving Common a default constructor instead of the
 workaround"

This reverts commit 8b6557e377f7bac1bdb38f3e6dd22c797417d09c.
---
 OpenSim/Tests/Permissions/DirectTransferTests.cs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'OpenSim/Tests/Permissions/DirectTransferTests.cs')

diff --git a/OpenSim/Tests/Permissions/DirectTransferTests.cs b/OpenSim/Tests/Permissions/DirectTransferTests.cs
index c68bbdf..0f251db 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.TheInstance = new Common();
+                Common.TheInstance.SetUp();
+            }
+
             Common.TheInstance.DeleteObjectsFolders();
         }
 
-- 
cgit v1.1