From 47488c90178544ddbaa5be544c3da61ec3a1979f Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 20 Oct 2018 16:01:26 +0100 Subject: [PATCH] change ossl tests setup --- .../ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs | 9 +++++++-- .../ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs | 6 ++++++ .../Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs | 8 ++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs index 2f9a5641bd..7d042c6911 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs @@ -64,11 +64,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests IConfigSource initConfigSource = new IniConfigSource(); IConfig config = initConfigSource.AddConfig("XEngine"); config.Set("Enabled", "true"); - config.Set("AllowOSFunctions", "true"); - config.Set("OSFunctionThreatLevel", "Severe"); + config = initConfigSource.AddConfig("NPC"); config.Set("Enabled", "true"); + config = initConfigSource.AddConfig("OSSL"); + config.Set("DebuggerSafe", false); + config.Set("AllowOSFunctions", "true"); + config.Set("OSFunctionThreatLevel", "Severe"); + + m_scene = new SceneHelpers().SetupScene(); SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule()); diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs index b6b3f12e42..4c7d0bbbb6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs @@ -71,6 +71,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests xengineConfig.Set("AllowOSFunctions", "true"); xengineConfig.Set("OSFunctionThreatLevel", "Severe"); + IConfig oconfig = initConfigSource.AddConfig("OSSL"); + oconfig.Set("DebuggerSafe", false); + oconfig.Set("Enabled", "true"); + oconfig.Set("AllowOSFunctions", "true"); + oconfig.Set("OSFunctionThreatLevel", "Severe"); + IConfig modulesConfig = initConfigSource.AddConfig("Modules"); modulesConfig.Set("InventoryAccessModule", "BasicInventoryAccessModule"); diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs index 693619104a..b44cc1641c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs @@ -66,11 +66,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests IConfigSource initConfigSource = new IniConfigSource(); IConfig config = initConfigSource.AddConfig("XEngine"); config.Set("Enabled", "true"); - config.Set("AllowOSFunctions", "true"); - config.Set("OSFunctionThreatLevel", "Severe"); + config = initConfigSource.AddConfig("NPC"); config.Set("Enabled", "true"); + config = initConfigSource.AddConfig("OSSL"); + config.Set("DebuggerSafe", false); + config.Set("AllowOSFunctions", "true"); + config.Set("OSFunctionThreatLevel", "Severe"); + m_scene = new SceneHelpers().SetupScene(); SceneHelpers.SetupSceneModules( m_scene, initConfigSource, new AvatarFactoryModule(), new AttachmentsModule(), new NPCModule());