diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-16 12:14:49 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-16 12:14:49 -0400 |
commit | 5e391b9f7c62e0d9328d09135521f65400e31283 (patch) | |
tree | a6850ef0fe27e4a72623f36a2b2730cd983d018a /OpenSim/Region | |
parent | * minor: comments (diff) | |
download | opensim-SC_OLD-5e391b9f7c62e0d9328d09135521f65400e31283.zip opensim-SC_OLD-5e391b9f7c62e0d9328d09135521f65400e31283.tar.gz opensim-SC_OLD-5e391b9f7c62e0d9328d09135521f65400e31283.tar.bz2 opensim-SC_OLD-5e391b9f7c62e0d9328d09135521f65400e31283.tar.xz |
* ShortVersion, another attempt at fixing the test thread death that randomly occurs.
* LongVersion nIni may be causing the test thread death. Pausing OpenSimulator during startup causes a nIni error that makes debugging startup operations difficult for users. It might be because when it's in pause mode, something else reads from the nini config passed? If it is, it might not be fixable.. however, if it's concurrency that causes nini death it would make sense to give each section of the tests a new IConfigSource so that they don't read from the same configsource at the same time.
Diffstat (limited to 'OpenSim/Region')
3 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs index bd11d97..9fb1041 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs | |||
@@ -34,6 +34,7 @@ using OpenMetaverse; | |||
34 | using OpenMetaverse.Packets; | 34 | using OpenMetaverse.Packets; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Tests.Common; | 36 | using OpenSim.Tests.Common; |
37 | using OpenSim.Tests.Common.Mock; | ||
37 | 38 | ||
38 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests | 39 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests |
39 | { | 40 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index 88452d2..8ec14c7 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
72 | scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm); | 72 | scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm); |
73 | 73 | ||
74 | ISharedRegionModule interregionComms = new RESTInterregionComms(); | 74 | ISharedRegionModule interregionComms = new RESTInterregionComms(); |
75 | interregionComms.Initialise(new IniConfigSource()); | 75 | interregionComms.Initialise( new IniConfigSource()); |
76 | interregionComms.PostInitialise(); | 76 | interregionComms.PostInitialise(); |
77 | SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms); | 77 | SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms); |
78 | SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms); | 78 | SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs index f290dd7..358ce22 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs | |||
@@ -35,6 +35,7 @@ using Nini.Config; | |||
35 | using OpenSim.Region.ScriptEngine.Shared.Api; | 35 | using OpenSim.Region.ScriptEngine.Shared.Api; |
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using System; | 37 | using System; |
38 | using OpenSim.Tests.Common.Mock; | ||
38 | 39 | ||
39 | namespace OpenSim.Region.ScriptEngine.Shared.Tests | 40 | namespace OpenSim.Region.ScriptEngine.Shared.Tests |
40 | { | 41 | { |
@@ -52,7 +53,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
52 | public void SetUp() | 53 | public void SetUp() |
53 | { | 54 | { |
54 | 55 | ||
55 | IniConfigSource initConfigSource = new IniConfigSource(); | 56 | IConfigSource initConfigSource = new IniConfigSource(); |
56 | IConfig config = initConfigSource.AddConfig("XEngine"); | 57 | IConfig config = initConfigSource.AddConfig("XEngine"); |
57 | config.Set("Enabled", "true"); | 58 | config.Set("Enabled", "true"); |
58 | 59 | ||