diff options
author | Justin Clark-Casey (justincc) | 2012-05-01 23:14:12 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-01 23:14:12 +0100 |
commit | 9d2e1c67a8969e4769006c7347505b58a7827b3f (patch) | |
tree | 1fb6d412e2d8a753e1b59af46f6ada0a45556e75 /OpenSim/Tests/Common/TestHelpers.cs | |
parent | Move max teleport distance check down into etm.DoTeleport() since this should... (diff) | |
download | opensim-SC_OLD-9d2e1c67a8969e4769006c7347505b58a7827b3f.zip opensim-SC_OLD-9d2e1c67a8969e4769006c7347505b58a7827b3f.tar.gz opensim-SC_OLD-9d2e1c67a8969e4769006c7347505b58a7827b3f.tar.bz2 opensim-SC_OLD-9d2e1c67a8969e4769006c7347505b58a7827b3f.tar.xz |
Add regression test for teleporting between neighbouring regions on the same simulator
This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true.
Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
Diffstat (limited to 'OpenSim/Tests/Common/TestHelpers.cs')
-rw-r--r-- | OpenSim/Tests/Common/TestHelpers.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Tests/Common/TestHelpers.cs b/OpenSim/Tests/Common/TestHelpers.cs index 5030d4b..6744fca 100644 --- a/OpenSim/Tests/Common/TestHelpers.cs +++ b/OpenSim/Tests/Common/TestHelpers.cs | |||
@@ -46,7 +46,8 @@ namespace OpenSim.Tests.Common | |||
46 | <!-- A1 uses PatternLayout --> | 46 | <!-- A1 uses PatternLayout --> |
47 | <layout type=""log4net.Layout.PatternLayout""> | 47 | <layout type=""log4net.Layout.PatternLayout""> |
48 | <!-- Print the date in ISO 8601 format --> | 48 | <!-- Print the date in ISO 8601 format --> |
49 | <conversionPattern value=""%date [%thread] %-5level %logger %ndc - %message%newline"" /> | 49 | <!-- <conversionPattern value=""%date [%thread] %-5level %logger %ndc - %message%newline"" /> --> |
50 | <conversionPattern value=""%date %message%newline"" /> | ||
50 | </layout> | 51 | </layout> |
51 | </appender> | 52 | </appender> |
52 | 53 | ||
@@ -62,9 +63,9 @@ namespace OpenSim.Tests.Common | |||
62 | Encoding.UTF8.GetBytes( | 63 | Encoding.UTF8.GetBytes( |
63 | // "<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/><appender-ref ref=\"A1\"/></root></log4net></configuration>"))); | 64 | // "<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/><appender-ref ref=\"A1\"/></root></log4net></configuration>"))); |
64 | //"<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>"))); | 65 | //"<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>"))); |
65 | //"<configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>"))); | 66 | // "<configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>")); |
66 | //"<configuration><log4net><root></root></log4net></configuration>"))); | 67 | // "<configuration><log4net><root></root></log4net></configuration>"))); |
67 | //"<configuration><log4net><root/></log4net></configuration>"))); | 68 | // "<configuration><log4net><root/></log4net></configuration>")); |
68 | "<log4net><root/></log4net>")); | 69 | "<log4net><root/></log4net>")); |
69 | 70 | ||
70 | public static bool AssertThisDelegateCausesArgumentException(TestDelegate d) | 71 | public static bool AssertThisDelegateCausesArgumentException(TestDelegate d) |