instrument most of the tests with a new InMethod function that may help us figure

out where that pesky deadlock is during test runs.
This commit is contained in:
Sean Dague
2009-05-07 19:07:08 +00:00
parent 84815ab271
commit ce0a84cbc0
15 changed files with 91 additions and 17 deletions

View File

@@ -30,6 +30,7 @@ using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Tests.Common;
using OpenSim.Tests.Common.Mock;
namespace OpenSim.Region.CoreModules.Agent.TextureSender
@@ -76,6 +77,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
[Test]
public void T010_SendPkg()
{
TestHelper.InMethod();
// Normal sending
AssetBase abase = new AssetBase(uuid1, "asset one");
byte[] abdata = new byte[testsize];
@@ -95,6 +97,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
[Test]
public void T011_UpdateReq()
{
TestHelper.InMethod();
// Test packet number start
AssetBase abase = new AssetBase(uuid2, "asset two");
byte[] abdata = new byte[testsize];
@@ -143,6 +146,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
[Test]
public void T999_FinishStatus()
{
TestHelper.InMethod();
// Of the 4 assets "sent", only 2 sent the first part.
Assert.That(client.sentdatapkt.Count,Is.EqualTo(2));

View File

@@ -68,6 +68,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test]
public void TestSaveIarV0p1()
{
TestHelper.InMethod();
//log4net.Config.XmlConfigurator.Configure();
InventoryArchiverModule archiverModule = new InventoryArchiverModule();
@@ -201,6 +202,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test]
public void TestLoadIarV0p1ExistingUsers()
{
TestHelper.InMethod();
Console.WriteLine("Started {0}", MethodBase.GetCurrentMethod());
//log4net.Config.XmlConfigurator.Configure();
@@ -267,6 +269,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test]
public void TestLoadIarV0p1TempProfiles()
{
TestHelper.InMethod();
Console.WriteLine("### Started {0} ###", MethodBase.GetCurrentMethod());
log4net.Config.XmlConfigurator.Configure();
@@ -336,6 +339,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test]
public void TestReplicateArchivePathToUserInventory()
{
TestHelper.InMethod();
CommunicationsManager commsManager = new TestCommunicationsManager();
CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>();

View File

@@ -79,6 +79,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
[Test]
public void TestSaveOarV0p2()
{
TestHelper.InMethod();
//log4net.Config.XmlConfigurator.Configure();
ArchiverModule archiverModule = new ArchiverModule();
@@ -202,6 +203,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
[Test]
public void TestLoadOarV0p2()
{
TestHelper.InMethod();
//log4net.Config.XmlConfigurator.Configure();
MemoryStream archiveWriteStream = new MemoryStream();
@@ -277,6 +279,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
//[Test]
public void TestMergeOarV0p2()
{
TestHelper.InMethod();
//XmlConfigurator.Configure();
MemoryStream archiveWriteStream = new MemoryStream();