OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Resolve http://opensimulator.org/mantis/view.php?id=3191 

* Catch directory exception on load oar as well as file exception
0.6.6-post-fixes
Justin Clarke Casey 2009-05-18 18:22:15 +00:00
parent ad7214620f
commit 29671fc103
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Application/OpenSim.cs
View File

@ -1115,7 +1115,11 @@ namespace OpenSim
} }
catch (FileNotFoundException) catch (FileNotFoundException)
{ {
m_console.Error("Specified oar not found. Usage: load oar <filename>"); m_console.Error("Specified oar file not found.");
}
catch (DirectoryNotFoundException)
{
m_console.Error("Specified directory not found.");
} }
} }
else else
@ -1126,8 +1130,8 @@ namespace OpenSim
} }
catch (FileNotFoundException) catch (FileNotFoundException)
{ {
m_console.Error("Default oar not found. Usage: load oar <filename>"); m_console.Error("Default oar file not found.");
} }
} }
} }

9
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
View File

@ -67,10 +67,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
/// </summary> /// </summary>
//[Test] //[Test]
public void TestSaveIarV0p1() public void TestSaveIarV0_1()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
//log4net.Config.XmlConfigurator.Configure(); log4net.Config.XmlConfigurator.Configure();
InventoryArchiverModule archiverModule = new InventoryArchiverModule(); InventoryArchiverModule archiverModule = new InventoryArchiverModule();
@ -198,11 +198,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// an account exists with the creator name. /// an account exists with the creator name.
/// </summary> /// </summary>
[Test] [Test]
public void TestLoadIarV0p1ExistingUsers() public void TestLoadIarV0_1ExistingUsers()
{ {
Assert.Ignore(); Assert.Ignore();
TestHelper.InMethod(); TestHelper.InMethod();
Console.WriteLine("Started {0}", MethodBase.GetCurrentMethod());
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
@ -266,7 +265,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// no account exists with the creator name /// no account exists with the creator name
/// </summary> /// </summary>
[Test] [Test]
public void TestLoadIarV0p1TempProfiles() public void TestLoadIarV0_1TempProfiles()
{ {
Assert.Ignore(); Assert.Ignore();
TestHelper.InMethod(); TestHelper.InMethod();

8
OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
View File

@ -78,10 +78,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
/// Test saving a V0.2 OpenSim Region Archive. /// Test saving a V0.2 OpenSim Region Archive.
/// </summary> /// </summary>
[Test] [Test]
public void TestSaveOarV0p2() public void TestSaveOarV0_2()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
ArchiverModule archiverModule = new ArchiverModule(); ArchiverModule archiverModule = new ArchiverModule();
SerialiserModule serialiserModule = new SerialiserModule(); SerialiserModule serialiserModule = new SerialiserModule();
@ -202,7 +202,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
/// Test loading a V0.2 OpenSim Region Archive. /// Test loading a V0.2 OpenSim Region Archive.
/// </summary> /// </summary>
[Test] [Test]
public void TestLoadOarV0p2() public void TestLoadOarV0_2()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
@ -275,7 +275,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
/// Test merging a V0.2 OpenSim Region Archive into an existing scene /// Test merging a V0.2 OpenSim Region Archive into an existing scene
/// </summary> /// </summary>
//[Test] //[Test]
public void TestMergeOarV0p2() public void TestMergeOarV0_2()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
//XmlConfigurator.Configure(); //XmlConfigurator.Configure();