diff options
author | Justin Clark-Casey (justincc) | 2013-07-26 19:22:30 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-07-26 19:22:30 +0100 |
commit | 056a6ee7653b17d8c1d92519f34f029bcd602143 (patch) | |
tree | ac59eb147365925e4fb4f3d37e9a77aa1f2a8976 /OpenSim/Tests | |
parent | Fix NPC regression test failures. (diff) | |
download | opensim-SC-056a6ee7653b17d8c1d92519f34f029bcd602143.zip opensim-SC-056a6ee7653b17d8c1d92519f34f029bcd602143.tar.gz opensim-SC-056a6ee7653b17d8c1d92519f34f029bcd602143.tar.bz2 opensim-SC-056a6ee7653b17d8c1d92519f34f029bcd602143.tar.xz |
Fix regression tests relating to agent transfer by making simulator use last week's SIMULATOR/0.1 protocol for now.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/OpenSimTestCase.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/OpenSimTestCase.cs b/OpenSim/Tests/Common/OpenSimTestCase.cs index 8c40923..3c47faa 100644 --- a/OpenSim/Tests/Common/OpenSimTestCase.cs +++ b/OpenSim/Tests/Common/OpenSimTestCase.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Framework.Servers; | ||
30 | 31 | ||
31 | namespace OpenSim.Tests.Common | 32 | namespace OpenSim.Tests.Common |
32 | { | 33 | { |
@@ -40,7 +41,14 @@ namespace OpenSim.Tests.Common | |||
40 | // Disable logging for each test so that one where logging is enabled doesn't cause all subsequent tests | 41 | // Disable logging for each test so that one where logging is enabled doesn't cause all subsequent tests |
41 | // to have logging on if it failed with an exception. | 42 | // to have logging on if it failed with an exception. |
42 | TestHelpers.DisableLogging(); | 43 | TestHelpers.DisableLogging(); |
44 | |||
45 | // This is an unfortunate bit of clean up we have to do because MainServer manages things through static | ||
46 | // variables and the VM is not restarted between tests. | ||
47 | if (MainServer.Instance != null) | ||
48 | { | ||
49 | MainServer.RemoveHttpServer(MainServer.Instance.Port); | ||
50 | // MainServer.Instance = null; | ||
51 | } | ||
43 | } | 52 | } |
44 | } | 53 | } |
45 | } | 54 | } \ No newline at end of file |
46 | |||