diff options
author | Justin Clarke Casey | 2009-05-18 18:22:15 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-18 18:22:15 +0000 |
commit | 29671fc103b0621c57ee87d7479fc69c7a953b32 (patch) | |
tree | 36a20ccb053cf4bf0420e8b97167617d9d07ff75 /OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |
parent | * Re-enable save oar test by loading asset data plugins from test mock class (diff) | |
download | opensim-SC_OLD-29671fc103b0621c57ee87d7479fc69c7a953b32.zip opensim-SC_OLD-29671fc103b0621c57ee87d7479fc69c7a953b32.tar.gz opensim-SC_OLD-29671fc103b0621c57ee87d7479fc69c7a953b32.tar.bz2 opensim-SC_OLD-29671fc103b0621c57ee87d7479fc69c7a953b32.tar.xz |
* Resolve http://opensimulator.org/mantis/view.php?id=3191
* Catch directory exception on load oar as well as file exception
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 9741399..7e86ec1 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -78,10 +78,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
78 | /// Test saving a V0.2 OpenSim Region Archive. | 78 | /// Test saving a V0.2 OpenSim Region Archive. |
79 | /// </summary> | 79 | /// </summary> |
80 | [Test] | 80 | [Test] |
81 | public void TestSaveOarV0p2() | 81 | public void TestSaveOarV0_2() |
82 | { | 82 | { |
83 | TestHelper.InMethod(); | 83 | TestHelper.InMethod(); |
84 | log4net.Config.XmlConfigurator.Configure(); | 84 | //log4net.Config.XmlConfigurator.Configure(); |
85 | 85 | ||
86 | ArchiverModule archiverModule = new ArchiverModule(); | 86 | ArchiverModule archiverModule = new ArchiverModule(); |
87 | SerialiserModule serialiserModule = new SerialiserModule(); | 87 | SerialiserModule serialiserModule = new SerialiserModule(); |
@@ -202,7 +202,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
202 | /// Test loading a V0.2 OpenSim Region Archive. | 202 | /// Test loading a V0.2 OpenSim Region Archive. |
203 | /// </summary> | 203 | /// </summary> |
204 | [Test] | 204 | [Test] |
205 | public void TestLoadOarV0p2() | 205 | public void TestLoadOarV0_2() |
206 | { | 206 | { |
207 | TestHelper.InMethod(); | 207 | TestHelper.InMethod(); |
208 | //log4net.Config.XmlConfigurator.Configure(); | 208 | //log4net.Config.XmlConfigurator.Configure(); |
@@ -275,7 +275,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
275 | /// Test merging a V0.2 OpenSim Region Archive into an existing scene | 275 | /// Test merging a V0.2 OpenSim Region Archive into an existing scene |
276 | /// </summary> | 276 | /// </summary> |
277 | //[Test] | 277 | //[Test] |
278 | public void TestMergeOarV0p2() | 278 | public void TestMergeOarV0_2() |
279 | { | 279 | { |
280 | TestHelper.InMethod(); | 280 | TestHelper.InMethod(); |
281 | //XmlConfigurator.Configure(); | 281 | //XmlConfigurator.Configure(); |