aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-09-28 17:42:35 -0700
committerDiva Canto2009-09-28 17:42:35 -0700
commita60ed0562ca403b5881e221ccbdd8366ff053a27 (patch)
tree6c7bb629afb47c21fe6ecd42300cbcc16ebe4be7
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-a60ed0562ca403b5881e221ccbdd8366ff053a27.zip
opensim-SC_OLD-a60ed0562ca403b5881e221ccbdd8366ff053a27.tar.gz
opensim-SC_OLD-a60ed0562ca403b5881e221ccbdd8366ff053a27.tar.bz2
opensim-SC_OLD-a60ed0562ca403b5881e221ccbdd8366ff053a27.tar.xz
I think I have fixed something that was broken in the scene setup (tests) and that needs to be reflected in all other services setups. But the teleport test still doesn't work. Commenting it for now.
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs7
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs17
2 files changed, 14 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 1dc1627..751c1cd 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -118,14 +118,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests
118 // shared module 118 // shared module
119 ISharedRegionModule interregionComms = new RESTInterregionComms(); 119 ISharedRegionModule interregionComms = new RESTInterregionComms();
120 120
121 Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm, "grid");
122 SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
123 sceneA.RegisterRegionWithGrid();
124 121
125 Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, cm, "grid"); 122 Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, cm, "grid");
126 SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms); 123 SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms);
127 sceneB.RegisterRegionWithGrid(); 124 sceneB.RegisterRegionWithGrid();
128 125
126 Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm, "grid");
127 SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
128 sceneA.RegisterRegionWithGrid();
129
129 UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041"); 130 UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041");
130 TestClient client = SceneSetupHelpers.AddRootAgent(sceneA, agentId); 131 TestClient client = SceneSetupHelpers.AddRootAgent(sceneA, agentId);
131 132
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 95f5e3c..53f24d9 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -249,21 +249,24 @@ namespace OpenSim.Tests.Common.Setup
249 249
250 private static void StartGridService(Scene testScene, bool real) 250 private static void StartGridService(Scene testScene, bool real)
251 { 251 {
252 ISharedRegionModule gridService = new LocalGridServicesConnector();
253 IConfigSource config = new IniConfigSource(); 252 IConfigSource config = new IniConfigSource();
254 config.AddConfig("Modules"); 253 config.AddConfig("Modules");
255 config.AddConfig("GridService"); 254 config.AddConfig("GridService");
256 config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector"); 255 config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector");
256 config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData");
257 if (real) 257 if (real)
258 config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService"); 258 config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
259 if (m_gridService == null)
260 {
261 ISharedRegionModule gridService = new LocalGridServicesConnector();
262 gridService.Initialise(config);
263 m_gridService = gridService;
264 }
259 //else 265 //else
260 // config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestGridService"); 266 // config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestGridService");
261 config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData"); 267 m_gridService.AddRegion(testScene);
262 gridService.Initialise(config); 268 m_gridService.RegionLoaded(testScene);
263 gridService.AddRegion(testScene); 269 //testScene.AddRegionModule(m_gridService.Name, m_gridService);
264 gridService.RegionLoaded(testScene);
265 testScene.AddRegionModule(gridService.Name, gridService);
266 m_gridService = gridService;
267 } 270 }
268 271
269 272