aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs20
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs2
2 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index d1f3113..fd79ffa 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
66 /// <summary> 66 /// <summary>
67 /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). 67 /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
68 /// </summary> 68 /// </summary>
69 //[Test] 69 [Test]
70 public void TestSaveIarV0_1() 70 public void TestSaveIarV0_1()
71 { 71 {
72 TestHelper.InMethod(); 72 TestHelper.InMethod();
@@ -127,10 +127,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
127 lock (this) 127 lock (this)
128 { 128 {
129 archiverModule.ArchiveInventory(userFirstName, userLastName, "Objects", archiveWriteStream); 129 archiverModule.ArchiveInventory(userFirstName, userLastName, "Objects", archiveWriteStream);
130 //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer;
131 //while (assetServer.HasWaitingRequests())
132 // assetServer.ProcessNextRequest();
133
134 Monitor.Wait(this, 60000); 130 Monitor.Wait(this, 60000);
135 } 131 }
136 132
@@ -160,9 +156,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
160 string filePath; 156 string filePath;
161 TarArchiveReader.TarEntryType tarEntryType; 157 TarArchiveReader.TarEntryType tarEntryType;
162 158
159 Console.WriteLine("Reading archive");
160
163 while (tar.ReadEntry(out filePath, out tarEntryType) != null) 161 while (tar.ReadEntry(out filePath, out tarEntryType) != null)
164 { 162 {
165 //Console.WriteLine("Got {0}", filePath); 163 Console.WriteLine("Got {0}", filePath);
166 164
167// if (ArchiveConstants.CONTROL_FILE_PATH == filePath) 165// if (ArchiveConstants.CONTROL_FILE_PATH == filePath)
168// { 166// {
@@ -171,13 +169,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
171 169
172 if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml")) 170 if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml"))
173 { 171 {
174 string fileName = filePath.Remove(0, "Objects/".Length); 172// string fileName = filePath.Remove(0, "Objects/".Length);
175 173//
176 if (fileName.StartsWith(part1.Name)) 174// if (fileName.StartsWith(part1.Name))
177 { 175// {
178 Assert.That(filePath, Is.EqualTo(expectedObject1FilePath)); 176 Assert.That(filePath, Is.EqualTo(expectedObject1FilePath));
179 gotObject1File = true; 177 gotObject1File = true;
180 } 178// }
181// else if (fileName.StartsWith(part2.Name)) 179// else if (fileName.StartsWith(part2.Name))
182// { 180// {
183// Assert.That(fileName, Is.EqualTo(expectedObject2FileName)); 181// Assert.That(fileName, Is.EqualTo(expectedObject2FileName));
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 434b734..413a2b9 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -136,6 +136,7 @@ namespace OpenSim.Tests.Common.Setup
136 assetService.AddRegion(testScene); 136 assetService.AddRegion(testScene);
137 assetService.RegionLoaded(testScene); 137 assetService.RegionLoaded(testScene);
138 testScene.AddRegionModule(assetService.Name, assetService); 138 testScene.AddRegionModule(assetService.Name, assetService);
139 assetService.PostInitialise();
139 140
140 testScene.SetModuleInterfaces(); 141 testScene.SetModuleInterfaces();
141 142
@@ -176,6 +177,7 @@ namespace OpenSim.Tests.Common.Setup
176 IRegionModule m = (IRegionModule)module; 177 IRegionModule m = (IRegionModule)module;
177 m.Initialise(scene, config); 178 m.Initialise(scene, config);
178 scene.AddModule(m.Name, m); 179 scene.AddModule(m.Name, m);
180 m.PostInitialise();
179 } 181 }
180 else if (module is IRegionModuleBase) 182 else if (module is IRegionModuleBase)
181 { 183 {