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 | |
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 '')
-rw-r--r-- | .nant/local.include | 6 | ||||
-rw-r--r-- | OpenSim/Tests/Permissions/DirectTransferTests.cs | 7 | ||||
-rw-r--r-- | 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 @@ | |||
145 | </exec> | 145 | </exec> |
146 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> | 146 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> |
147 | 147 | ||
148 | <!-- This uses SetUpFixture, which older versions of nant don't seem to understand, so commenting for now | ||
149 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.permissions"> | 148 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.permissions"> |
150 | <arg value="./bin/OpenSim.Tests.Permissions.dll" /> | 149 | <arg value="./bin/OpenSim.Tests.Permissions.dll" /> |
151 | </exec> | 150 | </exec> |
152 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> | 151 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> |
153 | --> | ||
154 | 152 | ||
155 | <delete dir="%temp%"/> | 153 | <delete dir="%temp%"/> |
156 | </target> | 154 | </target> |
@@ -267,12 +265,10 @@ | |||
267 | <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" /> | 265 | <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" /> |
268 | </exec> | 266 | </exec> |
269 | 267 | ||
270 | <!-- | ||
271 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests.permissions"> | 268 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests.permissions"> |
272 | <arg value="./bin/OpenSim.Tests.Permissions.dll" /> | 269 | <arg value="./bin/OpenSim.Tests.Permissions.dll" /> |
273 | <arg value="-xml=test-results/OpenSim.Tests.Permissions.dll-Results.xml" /> | 270 | <arg value="-xml=test-results/OpenSim.Tests.Permissions.dll-Results.xml" /> |
274 | </exec> | 271 | </exec> |
275 | --> | ||
276 | 272 | ||
277 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> | 273 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> |
278 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> | 274 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> |
@@ -285,7 +281,7 @@ | |||
285 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> | 281 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> |
286 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> | 282 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> |
287 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> | 283 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> |
288 | <!-- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> --> | 284 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> |
289 | </target> | 285 | </target> |
290 | 286 | ||
291 | <target name="doxygen"> | 287 | <target name="doxygen"> |
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 | ||