diff options
author | Justin Clark-Casey (justincc) | 2013-02-07 00:54:09 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-02-07 00:54:09 +0000 |
commit | 4d1758985f64fbdbfd142684c1a4ac82c9a4b97a (patch) | |
tree | 146c789899a22ed8b3cbc57abaf6e0a6fbd4573c | |
parent | minor: add method doc to DAMap.ValidateKey() (diff) | |
download | opensim-SC_OLD-4d1758985f64fbdbfd142684c1a4ac82c9a4b97a.zip opensim-SC_OLD-4d1758985f64fbdbfd142684c1a4ac82c9a4b97a.tar.gz opensim-SC_OLD-4d1758985f64fbdbfd142684c1a4ac82c9a4b97a.tar.bz2 opensim-SC_OLD-4d1758985f64fbdbfd142684c1a4ac82c9a4b97a.tar.xz |
Make json store tests operate on a single thread to ensure we don't run into any race related test failures in the future.
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs index 8042a93..34422b4 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs | |||
@@ -54,6 +54,22 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests | |||
54 | private MockScriptEngine m_engine; | 54 | private MockScriptEngine m_engine; |
55 | private ScriptModuleCommsModule m_smcm; | 55 | private ScriptModuleCommsModule m_smcm; |
56 | 56 | ||
57 | [TestFixtureSetUp] | ||
58 | public void FixtureInit() | ||
59 | { | ||
60 | // Don't allow tests to be bamboozled by asynchronous events. Execute everything on the same thread. | ||
61 | Util.FireAndForgetMethod = FireAndForgetMethod.RegressionTest; | ||
62 | } | ||
63 | |||
64 | [TestFixtureTearDown] | ||
65 | public void TearDown() | ||
66 | { | ||
67 | // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple | ||
68 | // threads. Possibly, later tests should be rewritten so none of them require async stuff (which regression | ||
69 | // tests really shouldn't). | ||
70 | Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod; | ||
71 | } | ||
72 | |||
57 | [SetUp] | 73 | [SetUp] |
58 | public override void SetUp() | 74 | public override void SetUp() |
59 | { | 75 | { |