aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Asset/Tests
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-04 22:51:47 +0100
committerJustin Clark-Casey (justincc)2011-07-04 22:51:47 +0100
commitbebc51a6e041d2bcd8fef110ea5b178ac614c59d (patch)
tree24607e305f4208dac6caaa0e738817298fd223d6 /OpenSim/Region/CoreModules/Asset/Tests
parentrefactor: Split file cache manipulation code into separate methods, as has al... (diff)
downloadopensim-SC-bebc51a6e041d2bcd8fef110ea5b178ac614c59d.zip
opensim-SC-bebc51a6e041d2bcd8fef110ea5b178ac614c59d.tar.gz
opensim-SC-bebc51a6e041d2bcd8fef110ea5b178ac614c59d.tar.bz2
opensim-SC-bebc51a6e041d2bcd8fef110ea5b178ac614c59d.tar.xz
Make it possible to disable the file part of the flotsam asset cache
This matches the ability to disable the memory part This is controlled through the FileCacheEnabled parameter in FlotsamCache.ini Default is true, so existing installations are not affected. Improved fcache command feedback when various caches are disabled. Re-enabled test for flotsam cache with file caching disabled.
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset/Tests')
-rw-r--r--OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
index 3498969..a4aeeda 100644
--- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
+++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
47 [TestFixture] 47 [TestFixture]
48 public class FlotsamAssetCacheTests 48 public class FlotsamAssetCacheTests
49 { 49 {
50// [Test] 50 [Test]
51 public void TestCacheAsset() 51 public void TestCacheAsset()
52 { 52 {
53 TestHelper.InMethod(); 53 TestHelper.InMethod();
@@ -58,6 +58,7 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
58 config.AddConfig("Modules"); 58 config.AddConfig("Modules");
59 config.Configs["Modules"].Set("AssetCaching", "FlotsamAssetCache"); 59 config.Configs["Modules"].Set("AssetCaching", "FlotsamAssetCache");
60 config.AddConfig("AssetCache"); 60 config.AddConfig("AssetCache");
61 config.Configs["AssetCache"].Set("FileCacheEnabled", "false");
61 config.Configs["AssetCache"].Set("MemoryCacheEnabled", "true"); 62 config.Configs["AssetCache"].Set("MemoryCacheEnabled", "true");
62 63
63 FlotsamAssetCache cache = new FlotsamAssetCache(); 64 FlotsamAssetCache cache = new FlotsamAssetCache();