diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index bd8d325..c140ec0 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -40,11 +40,12 @@ using OpenSim.Framework.Communications.Cache; | |||
40 | using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; | 40 | using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; |
41 | using OpenSim.Region.CoreModules.World.Archiver; | 41 | using OpenSim.Region.CoreModules.World.Archiver; |
42 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
43 | using OpenSim.Tests.Common; | ||
43 | using OpenSim.Tests.Common.Setup; | 44 | using OpenSim.Tests.Common.Setup; |
44 | 45 | ||
45 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | 46 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests |
46 | { | 47 | { |
47 | [TestFixture] | 48 | [TestFixture, LongRunning] |
48 | public class InventoryArchiverTests | 49 | public class InventoryArchiverTests |
49 | { | 50 | { |
50 | private void SaveCompleted( | 51 | private void SaveCompleted( |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 6a64ff1..04c3289 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -38,11 +38,12 @@ using OpenSim.Framework.Serialization; | |||
38 | using OpenSim.Region.CoreModules.World.Serialiser; | 38 | using OpenSim.Region.CoreModules.World.Serialiser; |
39 | using OpenSim.Region.CoreModules.World.Terrain; | 39 | using OpenSim.Region.CoreModules.World.Terrain; |
40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
41 | using OpenSim.Tests.Common; | ||
41 | using OpenSim.Tests.Common.Setup; | 42 | using OpenSim.Tests.Common.Setup; |
42 | 43 | ||
43 | namespace OpenSim.Region.CoreModules.World.Archiver.Tests | 44 | namespace OpenSim.Region.CoreModules.World.Archiver.Tests |
44 | { | 45 | { |
45 | [TestFixture] | 46 | [TestFixture, LongRunning] |
46 | public class ArchiverTests | 47 | public class ArchiverTests |
47 | { | 48 | { |
48 | private void SaveCompleted(string errorMessage) | 49 | private void SaveCompleted(string errorMessage) |
@@ -230,7 +231,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
230 | /// <summary> | 231 | /// <summary> |
231 | /// Test merging a V0.2 OpenSim Region Archive into an existing scene | 232 | /// Test merging a V0.2 OpenSim Region Archive into an existing scene |
232 | /// </summary> | 233 | /// </summary> |
233 | ///[Test] | 234 | |
235 | [Test] | ||
234 | public void TestMergeOarV0p2() | 236 | public void TestMergeOarV0p2() |
235 | { | 237 | { |
236 | //XmlConfigurator.Configure(); | 238 | //XmlConfigurator.Configure(); |