aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent
diff options
context:
space:
mode:
authorSean Dague2009-05-07 19:07:08 +0000
committerSean Dague2009-05-07 19:07:08 +0000
commitce0a84cbc0e277dd5be08a20febf13364a985a3a (patch)
treed5fc2dda5eaf3674c67d82198efd04323f1ba7a5 /OpenSim/Region/CoreModules/Agent
parentRemoteAdminPlugin was using a mixture of both "true"/"false" and 0/1 (diff)
downloadopensim-SC-ce0a84cbc0e277dd5be08a20febf13364a985a3a.zip
opensim-SC-ce0a84cbc0e277dd5be08a20febf13364a985a3a.tar.gz
opensim-SC-ce0a84cbc0e277dd5be08a20febf13364a985a3a.tar.bz2
opensim-SC-ce0a84cbc0e277dd5be08a20febf13364a985a3a.tar.xz
instrument most of the tests with a new InMethod function that may help us figure
out where that pesky deadlock is during test runs.
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
index ec95187..7b3e887 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
30using NUnit.Framework.SyntaxHelpers; 30using NUnit.Framework.SyntaxHelpers;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Tests.Common;
33using OpenSim.Tests.Common.Mock; 34using OpenSim.Tests.Common.Mock;
34 35
35namespace OpenSim.Region.CoreModules.Agent.TextureSender 36namespace OpenSim.Region.CoreModules.Agent.TextureSender
@@ -76,6 +77,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
76 [Test] 77 [Test]
77 public void T010_SendPkg() 78 public void T010_SendPkg()
78 { 79 {
80 TestHelper.InMethod();
79 // Normal sending 81 // Normal sending
80 AssetBase abase = new AssetBase(uuid1, "asset one"); 82 AssetBase abase = new AssetBase(uuid1, "asset one");
81 byte[] abdata = new byte[testsize]; 83 byte[] abdata = new byte[testsize];
@@ -95,6 +97,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
95 [Test] 97 [Test]
96 public void T011_UpdateReq() 98 public void T011_UpdateReq()
97 { 99 {
100 TestHelper.InMethod();
98 // Test packet number start 101 // Test packet number start
99 AssetBase abase = new AssetBase(uuid2, "asset two"); 102 AssetBase abase = new AssetBase(uuid2, "asset two");
100 byte[] abdata = new byte[testsize]; 103 byte[] abdata = new byte[testsize];
@@ -143,6 +146,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
143 [Test] 146 [Test]
144 public void T999_FinishStatus() 147 public void T999_FinishStatus()
145 { 148 {
149 TestHelper.InMethod();
146 // Of the 4 assets "sent", only 2 sent the first part. 150 // Of the 4 assets "sent", only 2 sent the first part.
147 Assert.That(client.sentdatapkt.Count,Is.EqualTo(2)); 151 Assert.That(client.sentdatapkt.Count,Is.EqualTo(2));
148 152