aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-18 18:22:15 +0000
committerJustin Clarke Casey2009-05-18 18:22:15 +0000
commit29671fc103b0621c57ee87d7479fc69c7a953b32 (patch)
tree36a20ccb053cf4bf0420e8b97167617d9d07ff75 /OpenSim/Region
parent* Re-enable save oar test by loading asset data plugins from test mock class (diff)
downloadopensim-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')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs10
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs9
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs8
3 files changed, 15 insertions, 12 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 2115b75..43a9d35 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -1115,7 +1115,11 @@ namespace OpenSim
1115 } 1115 }
1116 catch (FileNotFoundException) 1116 catch (FileNotFoundException)
1117 { 1117 {
1118 m_console.Error("Specified oar not found. Usage: load oar <filename>"); 1118 m_console.Error("Specified oar file not found.");
1119 }
1120 catch (DirectoryNotFoundException)
1121 {
1122 m_console.Error("Specified directory not found.");
1119 } 1123 }
1120 } 1124 }
1121 else 1125 else
@@ -1126,8 +1130,8 @@ namespace OpenSim
1126 } 1130 }
1127 catch (FileNotFoundException) 1131 catch (FileNotFoundException)
1128 { 1132 {
1129 m_console.Error("Default oar not found. Usage: load oar <filename>"); 1133 m_console.Error("Default oar file not found.");
1130 } 1134 }
1131 } 1135 }
1132 } 1136 }
1133 1137
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index b979a35..d1f3113 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -67,10 +67,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
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 TestSaveIarV0p1() 70 public void TestSaveIarV0_1()
71 { 71 {
72 TestHelper.InMethod(); 72 TestHelper.InMethod();
73 //log4net.Config.XmlConfigurator.Configure(); 73 log4net.Config.XmlConfigurator.Configure();
74 74
75 InventoryArchiverModule archiverModule = new InventoryArchiverModule(); 75 InventoryArchiverModule archiverModule = new InventoryArchiverModule();
76 76
@@ -198,11 +198,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
198 /// an account exists with the creator name. 198 /// an account exists with the creator name.
199 /// </summary> 199 /// </summary>
200 [Test] 200 [Test]
201 public void TestLoadIarV0p1ExistingUsers() 201 public void TestLoadIarV0_1ExistingUsers()
202 { 202 {
203 Assert.Ignore(); 203 Assert.Ignore();
204 TestHelper.InMethod(); 204 TestHelper.InMethod();
205 Console.WriteLine("Started {0}", MethodBase.GetCurrentMethod());
206 205
207 //log4net.Config.XmlConfigurator.Configure(); 206 //log4net.Config.XmlConfigurator.Configure();
208 207
@@ -266,7 +265,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
266 /// no account exists with the creator name 265 /// no account exists with the creator name
267 /// </summary> 266 /// </summary>
268 [Test] 267 [Test]
269 public void TestLoadIarV0p1TempProfiles() 268 public void TestLoadIarV0_1TempProfiles()
270 { 269 {
271 Assert.Ignore(); 270 Assert.Ignore();
272 TestHelper.InMethod(); 271 TestHelper.InMethod();
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();