diff options
| author | Justin Clark-Casey (justincc) | 2012-03-20 01:41:32 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-20 01:41:32 +0000 |
| commit | a3abd65e3de850a4516b91a017b1049ce4abe4fe (patch) | |
| tree | c4deff8171506b6e0f4e3a7b62813f857fdc72b7 /OpenSim/Region | |
| parent | Remove some pointless catching/throwing in the scene loop. (diff) | |
| download | opensim-SC_OLD-a3abd65e3de850a4516b91a017b1049ce4abe4fe.zip opensim-SC_OLD-a3abd65e3de850a4516b91a017b1049ce4abe4fe.tar.gz opensim-SC_OLD-a3abd65e3de850a4516b91a017b1049ce4abe4fe.tar.bz2 opensim-SC_OLD-a3abd65e3de850a4516b91a017b1049ce4abe4fe.tar.xz | |
Remove pointless ThreadAbortException catching in a test that isn't run anyway.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs index c5a76b2..bebc10c 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs | |||
| @@ -63,17 +63,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 63 | 63 | ||
| 64 | Thread testThread = new Thread(testClass.run); | 64 | Thread testThread = new Thread(testClass.run); |
| 65 | 65 | ||
| 66 | try | 66 | // Seems kind of redundant to start a thread and then join it, however.. We need to protect against |
| 67 | { | 67 | // A thread abort exception in the simulator code. |
| 68 | // Seems kind of redundant to start a thread and then join it, however.. We need to protect against | 68 | testThread.Start(); |
| 69 | // A thread abort exception in the simulator code. | 69 | testThread.Join(); |
| 70 | testThread.Start(); | 70 | |
| 71 | testThread.Join(); | ||
| 72 | } | ||
| 73 | catch (ThreadAbortException) | ||
| 74 | { | ||
| 75 | |||
| 76 | } | ||
| 77 | Assert.That(testClass.results.Result, Is.EqualTo(true), testClass.results.Message); | 71 | Assert.That(testClass.results.Result, Is.EqualTo(true), testClass.results.Message); |
| 78 | // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | 72 | // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); |
| 79 | } | 73 | } |