aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-22 01:08:24 +0000
committerJustin Clark-Casey (justincc)2013-01-22 01:08:24 +0000
commit419f8e0f76ba765044d2ac29e03ee714356f42e3 (patch)
tree3325c44b79d3d4e635ecb3a6bde21020646b2a02 /OpenSim/Region/ScriptEngine
parentminor: comment out Console.WriteLine debugging message in XEngine (diff)
downloadopensim-SC_OLD-419f8e0f76ba765044d2ac29e03ee714356f42e3.zip
opensim-SC_OLD-419f8e0f76ba765044d2ac29e03ee714356f42e3.tar.gz
opensim-SC_OLD-419f8e0f76ba765044d2ac29e03ee714356f42e3.tar.bz2
opensim-SC_OLD-419f8e0f76ba765044d2ac29e03ee714356f42e3.tar.xz
Increase WaitForEventCompletionOnScriptStop to 120 secs to show that the co-op setting is active in its regression tests.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
index c23d7a6..53b992d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
@@ -77,6 +77,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
77 77
78 xEngineConfig.Set("ScriptStopStrategy", "co-op"); 78 xEngineConfig.Set("ScriptStopStrategy", "co-op");
79 79
80 // This is not currently used at all for co-op termination. Bumping up to demonstrate that co-op termination
81 // has an effect - without it tests will fail due to a 120 second wait for the event to finish.
82 xEngineConfig.Set("WaitForEventCompletionOnScriptStop", 120000);
83
80 m_scene = new SceneHelpers().SetupScene("My Test", UUID.Random(), 1000, 1000, configSource); 84 m_scene = new SceneHelpers().SetupScene("My Test", UUID.Random(), 1000, 1000, configSource);
81 SceneHelpers.SetupSceneModules(m_scene, configSource, m_xEngine); 85 SceneHelpers.SetupSceneModules(m_scene, configSource, m_xEngine);
82 m_scene.StartScripts(); 86 m_scene.StartScripts();