aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2017-08-14 16:49:11 -0700
committerDiva Canto2017-08-14 16:49:11 -0700
commit8b6557e377f7bac1bdb38f3e6dd22c797417d09c (patch)
tree41e228bbd3dcc90fcd29accd1aaf2a0914129c82 /OpenSim
parentThis is the correct work around. Jenkins is confuzzled. (diff)
downloadopensim-SC_OLD-8b6557e377f7bac1bdb38f3e6dd22c797417d09c.zip
opensim-SC_OLD-8b6557e377f7bac1bdb38f3e6dd22c797417d09c.tar.gz
opensim-SC_OLD-8b6557e377f7bac1bdb38f3e6dd22c797417d09c.tar.bz2
opensim-SC_OLD-8b6557e377f7bac1bdb38f3e6dd22c797417d09c.tar.xz
Let's try giving Common a default constructor instead of the workaround
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Tests/Permissions/Common.cs4
-rw-r--r--OpenSim/Tests/Permissions/DirectTransferTests.cs7
-rw-r--r--OpenSim/Tests/Permissions/IndirectTransferTests.cs6
3 files changed, 4 insertions, 13 deletions
diff --git a/OpenSim/Tests/Permissions/Common.cs b/OpenSim/Tests/Permissions/Common.cs
index 4ecce38..cf4d2bd 100644
--- a/OpenSim/Tests/Permissions/Common.cs
+++ b/OpenSim/Tests/Permissions/Common.cs
@@ -60,6 +60,10 @@ namespace OpenSim.Tests.Permissions
60 private TestScene m_Scene; 60 private TestScene m_Scene;
61 private ScenePresence[] m_Avatars = new ScenePresence[3]; 61 private ScenePresence[] m_Avatars = new ScenePresence[3];
62 62
63 public Common()
64 {
65 }
66
63 [SetUp] 67 [SetUp]
64 public override void SetUp() 68 public override void SetUp()
65 { 69 {
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
44 [SetUp] 44 [SetUp]
45 public void SetUp() 45 public void SetUp()
46 { 46 {
47 // In case we're dealing with some older version of nunit
48 if (Common.TheInstance == null)
49 {
50 Common.TheInstance = new Common();
51 Common.TheInstance.SetUp();
52 }
53
54 Common.TheInstance.DeleteObjectsFolders(); 47 Common.TheInstance.DeleteObjectsFolders();
55 } 48 }
56 49
diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs
index fb96b8b..66a228a 100644
--- a/OpenSim/Tests/Permissions/IndirectTransferTests.cs
+++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs
@@ -46,12 +46,6 @@ namespace OpenSim.Tests.Permissions
46 [SetUp] 46 [SetUp]
47 public void SetUp() 47 public void SetUp()
48 { 48 {
49 // In case we're dealing with some older version of nunit
50 if (Common.TheInstance == null)
51 {
52 Common.TheInstance = new Common();
53 Common.TheInstance.SetUp();
54 }
55 Common.TheInstance.DeleteObjectsFolders(); 49 Common.TheInstance.DeleteObjectsFolders();
56 } 50 }
57 51