diff options
| author | Diva Canto | 2017-08-14 16:33:21 -0700 |
|---|---|---|
| committer | Diva Canto | 2017-08-14 16:33:21 -0700 |
| commit | 40f4b30361d10db4ac35bcec5e172e8f6ae012c4 (patch) | |
| tree | da2d9968acaa02d9f27694a98cc48c8e1956d8aa /OpenSim/Tests | |
| parent | Comment to trigger jenkins (diff) | |
| download | opensim-SC_OLD-40f4b30361d10db4ac35bcec5e172e8f6ae012c4.zip opensim-SC_OLD-40f4b30361d10db4ac35bcec5e172e8f6ae012c4.tar.gz opensim-SC_OLD-40f4b30361d10db4ac35bcec5e172e8f6ae012c4.tar.bz2 opensim-SC_OLD-40f4b30361d10db4ac35bcec5e172e8f6ae012c4.tar.xz | |
Strengthen the tests for the possibility that SetUpFixture does not run in the beginning.
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Permissions/DirectTransferTests.cs | 7 | ||||
| -rw-r--r-- | OpenSim/Tests/Permissions/IndirectTransferTests.cs | 6 |
2 files changed, 13 insertions, 0 deletions
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 | |||
| 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 c = new Common(); | ||
| 51 | c.SetUp(); | ||
| 52 | } | ||
| 53 | |||
| 47 | Common.TheInstance.DeleteObjectsFolders(); | 54 | Common.TheInstance.DeleteObjectsFolders(); |
| 48 | } | 55 | } |
| 49 | 56 | ||
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 | |||
| 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 c = new Common(); | ||
| 53 | c.SetUp(); | ||
| 54 | } | ||
| 49 | Common.TheInstance.DeleteObjectsFolders(); | 55 | Common.TheInstance.DeleteObjectsFolders(); |
| 50 | } | 56 | } |
| 51 | 57 | ||